diff options
author | Paul Phillips <paulp@improving.org> | 2013-01-29 11:23:59 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-01-29 13:10:48 -0800 |
commit | 5c00f4137fbc02a6bfcb3eb52d225e26b4373615 (patch) | |
tree | fb0fb1c54e213016d8f4bf1fe8b6fd1770ff4760 /test/files/jvm | |
parent | f389f6a18f5812a08f324222432ba45a5b15aa18 (diff) | |
parent | d392d56d6bf8b0ae9072b354e4ec68becd0df679 (diff) | |
download | scala-5c00f4137fbc02a6bfcb3eb52d225e26b4373615.tar.gz scala-5c00f4137fbc02a6bfcb3eb52d225e26b4373615.tar.bz2 scala-5c00f4137fbc02a6bfcb3eb52d225e26b4373615.zip |
Merge remote-tracking branch 'origin/2.10.x' into pr/merge-210
* commit 'd392d56d6bf8b0ae9072b354e4ec68becd0df679':
SI-4602 Disable unreliable test of fsc path absolutization
Update a checkfile from a recent fix.
SI-7018 Fix memory leak in Attachments.
SI-4733 - fsc no longer creates a single temp directory for all users.
Bumped partest MaxPermSize to 128m.
SI-6891 Fix value class + tailrec crasher.
Ill-scoped reference checking in TreeCheckers
Make value classes TreeCheckers friendly
SI-4602 Make fsc absolutize source file names
SI-6863 Fix verify error in captured var inited from expr with try/catch
SI-6932 Remove Batchable trait plus minor clean-ups
Fix SI-6932 by enabling linearization of callback execution for the internal execution context of Future
SI-6443 Expand test coverage with varargs, by-name.
SI-6443 Widen dependent param types in uncurry
Conflicts:
src/reflect/scala/reflect/internal/Trees.scala
test/partest
Diffstat (limited to 'test/files/jvm')
-rw-r--r-- | test/files/jvm/scala-concurrent-tck.scala | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala index b529bca38a..b2b4183564 100644 --- a/test/files/jvm/scala-concurrent-tck.scala +++ b/test/files/jvm/scala-concurrent-tck.scala @@ -134,6 +134,12 @@ trait FutureCallbacks extends TestBase { assert(false) } } + + def testThatNestedCallbacksDoNotYieldStackOverflow(): Unit = { + val promise = Promise[Int] + (0 to 10000).map(Future(_)).foldLeft(promise.future)((f1, f2) => f2.flatMap(i => f1)) + promise.success(-1) + } testOnSuccess() testOnSuccessWhenCompleted() @@ -143,6 +149,7 @@ trait FutureCallbacks extends TestBase { // testOnFailureWhenSpecialThrowable(6, new scala.util.control.ControlThrowable { }) //TODO: this test is currently problematic, because NonFatal does not match InterruptedException //testOnFailureWhenSpecialThrowable(7, new InterruptedException) + testThatNestedCallbacksDoNotYieldStackOverflow() testOnFailureWhenTimeoutException() } |