summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2010-11-01 00:26:14 +0000
committerPhilipp Haller <hallerp@gmail.com>2010-11-01 00:26:14 +0000
commit6beaf28e6d25535ac9a1d4abe195bb32ebff8c15 (patch)
treecb661bc9491d85bb0f60e69cbe64fb4fe6c32222
parent09ec5aa3f09e48e9d8944111a0c1b2a0ae86e97e (diff)
downloadscala-6beaf28e6d25535ac9a1d4abe195bb32ebff8c15.tar.gz
scala-6beaf28e6d25535ac9a1d4abe195bb32ebff8c15.tar.bz2
scala-6beaf28e6d25535ac9a1d4abe195bb32ebff8c15.zip
Removed race from test for #3356. No review
-rw-r--r--test/files/jvm/t3356.check2
-rw-r--r--test/files/jvm/t3356.scala3
2 files changed, 4 insertions, 1 deletions
diff --git a/test/files/jvm/t3356.check b/test/files/jvm/t3356.check
index 6a9284d0aa..25f47b70c9 100644
--- a/test/files/jvm/t3356.check
+++ b/test/files/jvm/t3356.check
@@ -1 +1,3 @@
sending download requests
+Couldn't download image because of java.lang.Exception: no connection
+Couldn't download image because of java.lang.Exception: no connection
diff --git a/test/files/jvm/t3356.scala b/test/files/jvm/t3356.scala
index 5626281e7d..a9e83fe503 100644
--- a/test/files/jvm/t3356.scala
+++ b/test/files/jvm/t3356.scala
@@ -39,7 +39,7 @@ object Test {
case FutureInput ! (data @ ImageData(_)) =>
renderImage(data)
case Exit(from, UncaughtException(_, Some(Download(info)), _, _, cause)) =>
- println("Couldn't download image "+info+" because of "+cause)
+ println("Couldn't download image because of "+cause)
}
}
println("OK, all images rendered.")
@@ -47,6 +47,7 @@ object Test {
def main(args: Array[String]) {
actor {
+ self.trapExit = true
renderImages("panorama.epfl.ch")
}
}