Fixing a few STC glitches.

Change-Id: I38c0a81911e392be0d6e1d392511456b57acf16c

@@ -19,4 +19,5 @@ scenario=${1:-smoke}
 
 
 [ -t 1 ] && stcColor=true || unset stcColor
 [ -t 1 ] && stcColor=true || unset stcColor
 
 
-java -jar $JAR $scenario "$@"
+[ -z "$stcDebug" ] && DEBUG_OPTS=""
+java $DEBUG_OPTS -jar $JAR $scenario "$@"

@@ -83,7 +83,7 @@ public class Coordinator {
         this.logDir = logDir;
         this.logDir = logDir;
         this.store = new ScenarioStore(processFlow, logDir, scenario.name());
         this.store = new ScenarioStore(processFlow, logDir, scenario.name());
         this.delegate = new Delegate();
         this.delegate = new Delegate();
-        this.latch = new CountDownLatch(store.getSteps().size());
+        this.latch = new CountDownLatch(1);
     }
     }
 
 
     /**
     /**
@@ -349,8 +349,10 @@ public class Coordinator {
             store.markComplete(step, status);
             store.markComplete(step, status);
             listeners.forEach(listener -> listener.onCompletion(step, status));
             listeners.forEach(listener -> listener.onCompletion(step, status));
             executeSucessors(step);
             executeSucessors(step);
+            if (store.isComplete()) {
                 latch.countDown();
                 latch.countDown();
             }
             }
+        }
 
 
         @Override
         @Override
         public void onOutput(Step step, String line) {
         public void onOutput(Step step, String line) {

@@ -157,27 +157,26 @@ public final class Main {
 
 
     // Processes the scenario 'run' command.
     // Processes the scenario 'run' command.
     private void processRun() {
     private void processRun() {
-        try {
         coordinator.reset();
         coordinator.reset();
-            coordinator.start();
-            int exitCode = coordinator.waitFor();
-            pause(100); // allow stdout to flush
-            System.exit(exitCode);
-        } catch (InterruptedException e) {
-            print("Unable to execute scenario %s", scenarioFile);
+        runCoordinator();
     }
     }
+
+    // Processes the scenario 'run' command for range of steps.
+    private void processRunRange() {
+        coordinator.reset(list(runFromPatterns), list(runToPatterns));
+        runCoordinator();
     }
     }
 
 
     // Processes the scenario 'list' command.
     // Processes the scenario 'list' command.
     private void processList() {
     private void processList() {
         coordinator.getRecords()
         coordinator.getRecords()
                 .forEach(event -> logStatus(event.time(), event.name(), event.status(), event.command()));
                 .forEach(event -> logStatus(event.time(), event.name(), event.status(), event.command()));
+        System.exit(0);
     }
     }
 
 
-    // Processes the scenario 'run' command for range of steps.
-    private void processRunRange() {
+    // Runs the coordinator and waits for it to finish.
+    private void runCoordinator() {
         try {
         try {
-            coordinator.reset(list(runFromPatterns), list(runToPatterns));
             coordinator.start();
             coordinator.start();
             int exitCode = coordinator.waitFor();
             int exitCode = coordinator.waitFor();
             pause(100); // allow stdout to flush
             pause(100); // allow stdout to flush

@@ -125,6 +125,16 @@ class ScenarioStore {
     }
     }
 
 
     /**
     /**
+     * Returns true if all steps in the store have been marked as completed
+     * regardless of the completion status.
+     *
+     * @return true if all steps completed one way or another
+     */
+    synchronized boolean isComplete() {
+        return !statusMap.values().stream().anyMatch(s -> s == WAITING || s == IN_PROGRESS);
+    }
+
+    /**
      * Indicates whether there are any failures.
      * Indicates whether there are any failures.
      *
      *
      * @return true if there are failed steps
      * @return true if there are failed steps