Clean up generated sequence md formatting and messages

bin/augment_metadata

@@ -6,17 +6,17 @@
 #
 
 if [[ $# -lt 2 ]]; then
-    echo Usage: $0 SITE_DIR DEVICE_ID [PUBBER_OPTS...]
+    echo Usage: $0 SITE_DIR DEVICE_ID [METADATA_OPTS...]
     false
 fi
 
 site_dir=$(realpath $1)
 device_id=$2
 shift 2
-pubber_opts=$*
+metadata_opts=$*
 
 nostate=false
-if [[ $pubber_opts =~ noState ]]; then
+if [[ $metadata_opts =~ noState ]]; then
     nostate=true
 fi
 

bin/sequencer

@@ -213,7 +213,7 @@ echo
 echo Extracting sequence results:
 # Sort by test name (6th field)
 egrep 'RESULT |CPBLTY ' $SEQUENCER_LOG | fgrep NOTICE | sort -k 6 | \
-    sed -e 's/.* NOTICE //' | tee $SEQUENCER_OUT
+    sed -E -e 's/.* NOTICE +//' | tee $SEQUENCER_OUT
 
 [[ -s $SEQUENCER_OUT ]] || fail No test results found.
 

bin/sequencer_report

@@ -137,15 +137,19 @@ class Sequence:
     buffer = []
     steps = []
 
-    file_lines = text.splitlines()
-    start_index = first_occurence(file_lines, lambda x: x[:2] == "1.")
-    sequence_lines = file_lines[start_index:]
-
-    for line in reversed(sequence_lines):
-      buffer.insert(0, line)
-      if re.match(cls.STEP_PREFIX, line):
-        steps.insert(0, SequenceStep(buffer.copy()))
-        buffer.clear()
+    try:
+      file_lines = text.splitlines()
+      start_index = first_occurence(file_lines, lambda x: x[:2] == "1.")
+      sequence_lines = file_lines[start_index:]
+
+      for line in reversed(sequence_lines):
+        buffer.insert(0, line)
+        if re.match(cls.STEP_PREFIX, line):
+          steps.insert(0, SequenceStep(buffer.copy()))
+          buffer.clear()
+    # pylint: disable-next=bare-except
+    except:
+      pass
     return steps
 
   @staticmethod

bin/test_itemized

@@ -147,7 +147,8 @@ else
     while read result; do
         # Two ?s matches the printf %02d above.
         expected=${result/#?? /}
-        fgrep "$expected" $GOLDEN_FILE || fail Expected result not found: $expected
+        echo Checking $GOLDEN_FILE for result: $expected
+        fgrep "$expected" $GOLDEN_FILE || fail Expected result not found: $result
     done < $RESULTS_OUT
 fi
 

bin/test_sequcheck

@@ -40,7 +40,7 @@ echo '####################' Starting gencode_seq tests
 mv $UDMI_ROOT/docs/specs/sequences/generated.md out/generated${suffix}.out
 mv out/generated.tmp $UDMI_ROOT/docs/specs/sequences/generated.md
 
-echo Comparing diff out/generated${suffix}.out docs/specs/sequences/generated.md
+echo Comparing diff out/generated${suffix}.out $UDMI_ROOT/docs/specs/sequences/generated.md
 diff -u out/generated${suffix}.out $UDMI_ROOT/docs/specs/sequences/generated.md || failures+="gencode_seq "
 echo '####################' Finished gencode_seq tests: $failures
 

bin/test_sequencer

@@ -115,13 +115,13 @@ echo Writing pubber output to $PUBBER_LOG
 echo bin/pubber $site_path $project_id $device_id $serial_no $pubber_opts
 bin/pubber $site_path $project_id $device_id $serial_no $pubber_opts > $PUBBER_LOG 2>&1 &
 
-WAITING=10
+WAITING=20
 for i in `seq 1 $WAITING`; do
+    echo Waiting for pubber startup $((WAITING - i))...
+    sleep 1
     if fgrep "Connection complete" $PUBBER_LOG; then
         break
     fi
-    echo Waiting for pubber startup $((WAITING - i))...
-    sleep 2
 done
 
 if [[ $i -eq $WAITING ]]; then
@@ -193,7 +193,8 @@ fi
 GOLDEN_FILE=etc/sequencer${suffix}.out
 echo Checking for correctness of completed tests in $GOLDEN_FILE...
 while read result; do
-    fgrep "$result" $GOLDEN_FILE || fail Expected result not found for $result
+    echo Checking $GOLDEN_FILE for expected result: $result
+    fgrep "$result" $GOLDEN_FILE || fail Expected result not found: $result
 done < out/sequencer${suffix}.out.save
 
 echo Done with $suffix test_sequencer run.

common/src/main/java/com/google/udmi/util/GeneralUtils.java

@@ -177,6 +177,13 @@ public static List<String> friendlyLineTrace(Throwable e) {
     return messages;
   }
 
+  public static String getRootCause(Throwable e) {
+    while (e.getCause() != null) {
+      e = e.getCause();
+    }
+    return e.getMessage();
+  }
+
   private static <T> T fromJsonFile(File path, Class<T> valueType, ObjectMapper objectMapper) {
     try {
       return OBJECT_MAPPER_STRICT.readValue(path, valueType);

common/src/main/java/com/google/udmi/util/JsonUtil.java

@@ -353,7 +353,7 @@ public static void safeSleep(long sleepTimeMs) {
     try {
       Thread.sleep(sleepTimeMs);
     } catch (Exception e) {
-      throw new RuntimeException("Interrupted sleep", e);
+      throw new RuntimeException("Interrupted safe sleep", e);
     }
   }