commit 8643937b4bc1a0e7f62cc098d88730292a237244
author Thomas Vachuska <tom@onlab.us> Fri Jun 05 09:21:32 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Jun 05 17:27:15 2015 +0000
tree 4340605f0dfe0b7ab097a8145910fb776d35055e
parent d189e28d4125299eaeaee480d16116b5e394eb03

Adding support for SKIPPED state to STC.

Change-Id: I5a90bedb6272f0bb1d76f0bc5e19e67e8d05eec8

utils/stc/src/main/java/org/onlab/stc/StepProcessor.java

diff --git a/utils/stc/src/main/java/org/onlab/stc/StepProcessor.java b/utils/stc/src/main/java/org/onlab/stc/StepProcessor.java
index 95d5c86..86315e9 100644
--- a/utils/stc/src/main/java/org/onlab/stc/StepProcessor.java
+++ b/utils/stc/src/main/java/org/onlab/stc/StepProcessor.java
@@ -15,6 +15,8 @@
  */
 package org.onlab.stc;
 
+import org.onlab.stc.Coordinator.Status;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -23,6 +25,8 @@
 import java.io.PrintWriter;
 
 import static java.lang.String.format;
+import static org.onlab.stc.Coordinator.Status.FAILED;
+import static org.onlab.stc.Coordinator.Status.SUCCEEDED;
 import static org.onlab.stc.Coordinator.print;
 
 /**
@@ -30,12 +34,12 @@
  */
 class StepProcessor implements Runnable {
 
+    private static final String IGNORE_CODE = "~";
     private static final int FAIL = -1;
 
     static String launcher = "stc-launcher ";
 
     private final Step step;
-    private final boolean skip;
     private final File logDir;
 
     private Process process;
@@ -45,25 +49,22 @@
      * Creates a process monitor.
      *
      * @param step     step or group to be executed
-     * @param skip     indicates the process should not actually execute
      * @param logDir   directory where step process log should be stored
      * @param delegate process lifecycle listener
      */
-    StepProcessor(Step step, boolean skip, File logDir, StepProcessListener delegate) {
+    StepProcessor(Step step, File logDir, StepProcessListener delegate) {
         this.step = step;
-        this.skip = skip;
         this.logDir = logDir;
         this.delegate = delegate;
     }
 
     @Override
     public void run() {
-        int code = FAIL;
         delegate.onStart(step);
-        if (!skip) {
-            code = execute();
-        }
-        delegate.onCompletion(step, code);
+        int code = execute();
+        boolean ignoreCode = step.env() != null && step.env.equals(IGNORE_CODE);
+        Status status = ignoreCode || code == 0 ? SUCCEEDED : FAILED;
+        delegate.onCompletion(step, status);
     }
 
     /**