commit cbd5f4e0ad2ccc5903d12df73e3f0b033df1b3ae
author Monty Taylor <mordred@inaugust.com> Sun Sep 10 15:00:29 2017 -0600
committer Monty Taylor <mordred@inaugust.com> Sun Sep 10 15:01:12 2017 -0600
tree ded14b25bcbf716624ac3399074bf1e33bcb07a3
parent 7e9ec03af4a94b25f0058c48c0ae7c8da504e62f

Check that generate-subunit exists before using it

If stack.sh fails before os-testr is installed, the generate-subunit
command won't exist.

Change-Id: I7998ed81e419e25d183e5a780df0b4459cca237c

stack.sh

diff --git a/stack.sh b/stack.sh
index 301e1e7..10ffc5e 100755
--- a/stack.sh
+++ b/stack.sh
@@ -537,14 +537,20 @@
 
     if [[ $r -ne 0 ]]; then
         echo "Error on exit"
-        generate-subunit $DEVSTACK_START_TIME $SECONDS 'fail' >> ${SUBUNIT_OUTPUT}
+        # If we error before we've installed os-testr, which will fail.
+        if type -p generate-subunit > /dev/null; then
+            generate-subunit $DEVSTACK_START_TIME $SECONDS 'fail' >> ${SUBUNIT_OUTPUT}
+        fi
         if [[ -z $LOGDIR ]]; then
             $TOP_DIR/tools/worlddump.py
         else
             $TOP_DIR/tools/worlddump.py -d $LOGDIR
         fi
     else
-        generate-subunit $DEVSTACK_START_TIME $SECONDS >> ${SUBUNIT_OUTPUT}
+        # If we error before we've installed os-testr, which will fail.
+        if type -p generate-subunit > /dev/null; then
+            generate-subunit $DEVSTACK_START_TIME $SECONDS >> ${SUBUNIT_OUTPUT}
+        fi
     fi
 
     exit $r