Partest no longer hangs when reporting fails.

2 files changed, 26 insertions, 19 deletions

diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala
index b4866c769e..898b795d93 100644
--- a/src/partest/scala/tools/partest/nest/DirectRunner.scala
+++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala
@@ -12,7 +12,7 @@ import java.io.{File, PrintStream, FileOutputStream, BufferedReader,
 import java.util.StringTokenizer
 
 import scala.actors.Actor._
-import scala.actors.Scheduler
+import scala.actors.{Scheduler, TIMEOUT}
 
 trait DirectRunner {
 
@@ -57,12 +57,15 @@ trait DirectRunner {
     var logsToDelete: List[File] = List()
     var outdirsToDelete: List[File] = List()
     workers foreach { w =>
-      receive {
+      receiveWithin(600 * 1000) {
         case Results(s, f, logs, outdirs) =>
           logsToDelete = logsToDelete ::: logs.filter(_.toDelete)
           outdirsToDelete = outdirsToDelete ::: outdirs
           succs += s
           fails += f
+        case TIMEOUT =>
+          // add at least one failure
+          fails += 1
       }
     }
     logsToDelete.foreach { log =>
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala
index a01b9b0974..967374e6ee 100644
--- a/src/partest/scala/tools/partest/nest/Worker.scala
+++ b/src/partest/scala/tools/partest/nest/Worker.scala
@@ -881,28 +881,32 @@ class Worker(val fileManager: FileManager) extends Actor {
     }
 
     def reportResult(logs: Option[LogContext]) {
-      // delete log file only if test was successful
-      if (succeeded && !logs.isEmpty)
-        logs.get.file.toDelete = true
-
       if (!succeeded) {
         errors += 1
         NestUI.verbose("incremented errors: "+errors)
       }
 
-      if (!logs.isEmpty)
-        logs.get.writers match {
-          case Some((swr, wr)) =>
-            printInfoEnd(succeeded, wr)
-            wr.flush()
-            swr.flush()
-            NestUI.normal(swr.toString)
-            if (!succeeded && fileManager.showDiff && diff != "")
-              NestUI.normal(diff)
-            if (!succeeded && fileManager.showLog)
-              showLog(logs.get.file)
-          case None =>
-        }
+      try {
+        // delete log file only if test was successful
+        if (succeeded && !logs.isEmpty)
+          logs.get.file.toDelete = true
+
+        if (!logs.isEmpty)
+          logs.get.writers match {
+            case Some((swr, wr)) =>
+              printInfoEnd(succeeded, wr)
+              wr.flush()
+              swr.flush()
+              NestUI.normal(swr.toString)
+              if (!succeeded && fileManager.showDiff && diff != "")
+                NestUI.normal(diff)
+              if (!succeeded && fileManager.showLog)
+                showLog(logs.get.file)
+            case None =>
+          }
+      } catch {
+        case npe: NullPointerException =>
+      }
     }
 
     val numFiles = files.size