Tidying up the error reporting.

We were spamming our logs with a bunch of redundant messages,
particularly surrounding timeouts. This should reduce the log
output to only the useful stuff when a test takes too long
to complete.

Also not blowing away the full XML report when a few tests
get lost along the way.

diff --git a/libcore/tools/runner/java/vogar/Driver.java b/libcore/tools/runner/java/vogar/Driver.java
index 00c46cf..7b3a833 100644 (file)
--- a/libcore/tools/runner/java/vogar/Driver.java
+++ b/libcore/tools/runner/java/vogar/Driver.java
@@ -33,8 +33,10 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Logger;
 import vogar.commands.Command;
+import vogar.commands.CommandFailedException;
 import vogar.commands.Mkdir;
 
 /**
@@ -159,8 +161,9 @@ final class Driver implements HostMonitor.Handler {
             }
 
             if (action == null) {
-                throw new IllegalStateException("Expected " + actions.size()
-                        + " actions but found only " + i);
+                outcome(new Outcome("vogar.Vogar", Result.ERROR,
+                        "Expected " + actions.size() + " actions but found only " + i));
+                break;
             }
 
             execute(action);
@@ -230,31 +233,39 @@ final class Driver implements HostMonitor.Handler {
         if (earlyFailure == null) {
             final Command command = mode.createActionCommand(action);
             Future<List<String>> consoleOut = command.executeLater();
-            final AtomicBoolean done = new AtomicBoolean();
+            final AtomicReference<Result> result = new AtomicReference<Result>();
 
             actionTimeoutTimer.schedule(new TimerTask() {
                 @Override public void run() {
-                    if (!done.get()) {
-                        // TODO: set a "timout" bit somewhere so we know why this failed.
-                        //       currently we report ERROR for all timeouts.
+                    if (result.compareAndSet(null, Result.EXEC_TIMEOUT)) {
                         logger.fine("killing " + action.getName() + " because it "
                                 + "timed out after " + timeoutSeconds + " seconds");
+                        command.destroy();
                     }
-                    command.destroy();
                 }
             }, timeoutSeconds * 1000);
 
-            boolean success = monitor.monitor(monitorPort, this);
-            done.set(true);
-            if (success) {
-                return;
+            boolean completedNormally = monitor.monitor(monitorPort, this);
+            if (completedNormally) {
+                if (result.compareAndSet(null, Result.SUCCESS)) {
+                    command.destroy();
+                }
+                return; // outcomes will have been reported via outcome()
             }
 
+            if (result.compareAndSet(null, Result.ERROR)) {
+                command.destroy();
+            }
             try {
                 earlyFailure = new Outcome(action.getName(), action.getName(),
-                        Result.ERROR, consoleOut.get());
+                        result.get(), consoleOut.get());
             } catch (Exception e) {
-                earlyFailure = new Outcome(action.getName(), Result.ERROR, e);
+                if (e.getCause() instanceof CommandFailedException) {
+                    earlyFailure = new Outcome(action.getName(), action.getName(), result.get(),
+                            ((CommandFailedException) e.getCause()).getOutputLines());
+                } else {
+                    earlyFailure = new Outcome(action.getName(), result.get(), e);
+                }
             }
         }
 

diff --git a/libcore/tools/runner/java/vogar/HostMonitor.java b/libcore/tools/runner/java/vogar/HostMonitor.java
index c5e84bf..d94b6c0 100644 (file)
--- a/libcore/tools/runner/java/vogar/HostMonitor.java
+++ b/libcore/tools/runner/java/vogar/HostMonitor.java
@@ -94,7 +94,7 @@ class HostMonitor {
             logger.log(Level.WARNING, "Connection error from localhost:" + port, e);
             return false;
         } catch (SAXException e) {
-            logger.log(Level.WARNING, "Received bad XML from localhost:" + port, e);
+            logger.log(Level.WARNING, "Received bad XML from localhost:" + port + " " + e);
             return false;
         }