Finally understood that timeouts are coming from json

Refactored into two tests, with the json stating the timeout
for the lava-test-shell in each.

Change-Id: I483a73df2cfee1bcff66ce4a67aefce5adac1177

5 files changed, 76 insertions, 41 deletions

diff --git a/test.sh b/test-lava-network.sh
index fd3071e..9ca3e00 100755
--- a/test.sh
+++ b/test-lava-network.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+#Note that 'success' happens when the final test times out, causing
+#lava-test-shell to finish with error...
 
 trap 'echo EXITED' EXIT
 
@@ -6,44 +8,6 @@ echo "*** STARTED TEST"
 export LAVA_MULTI_NODE_DEBUG=1
 
 if test x"`lava-role`" = xsender; then
-  echo "*** LAVA-SEND TEST"
-  lava-send test || exit 1
-elif test x"`lava-role`" = xwaiter; then
-  echo "*** LAVA-WAIT-ALL TEST SENDER"
-  if lava-wait-all test sender; then
-    echo "lava-wait-all (role bounded) succeeded without preceeding send"
-    echo "*** UNEXPECTED"
-    exit 1
-  else
-    echo "lava-wait-all (role bounded) failed    without preceeding send"
-    echo "***   EXPECTED"
-  fi
-  lava-send test || exit 1
-  if lava-wait-all test sender; then
-    echo "lava-wait-all (role bounded) succeeded with preceeding send"
-    echo "***   EXPECTED"
-  else
-    echo "lava-wait-all (role bounded) failed    with preceeding send"
-    echo "*** UNEXPECTED"
-    exit 1
-  fi
-  if lava-wait-all test; then
-    echo "lava-wait-all (unbounded)    succeeded even though skulker did not send message"
-    echo "*** UNEXPECTED"
-    exit 1
-  else
-    echo "lava-wait-all (unbounded)    failed               (skulker did not send message)"
-    echo "***   EXPECTED"
-  fi
-elif test x"`lava-role`" = xskulker; then
-  echo "*** SKULKER WILL NOT SEND TEST MESSGE"
-else
-  echo "*** UNKNOWN ROLE '`lava-role`'"
-  exit 1
-fi
-
-#lava-network
-if test x"`lava-role`" = xsender; then
   echo "*** LAVA-NETWORK BROADCAST"
   lava-network broadcast eth0 || exit 1
 elif test x"`lava-role`" = xwaiter; then
diff --git a/test.yaml b/test-lava-network.yaml
index bd5b396..c1973fe 100644
--- a/test.yaml
+++ b/test-lava-network.yaml
@@ -6,4 +6,4 @@ metadata:
 
 run:
     steps:
-        - ./test.sh
+        - ./test-lava-network.sh
diff --git a/test-lava-wait-all.sh b/test-lava-wait-all.sh
new file mode 100755
index 0000000..3de79f7
--- /dev/null
+++ b/test-lava-wait-all.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+#Note that 'success' happens when the final test times out, causing
+#lava-test-shell to finish with error...
+
+trap 'echo EXITED' EXIT
+
+echo "*** STARTED TEST"
+export LAVA_MULTI_NODE_DEBUG=1
+
+if test x"`lava-role`" = xsender; then
+  echo "*** LAVA-SEND TEST"
+  lava-send test || exit 1
+elif test x"`lava-role`" = xwaiter; then
+  echo "*** LAVA-WAIT-ALL TEST SENDER"
+  if lava-wait-all test sender; then
+    echo "lava-wait-all (role bounded) succeeded without preceeding send"
+    echo "*** UNEXPECTED"
+    exit 1
+  else
+    echo "lava-wait-all (role bounded) failed    without preceeding send"
+    echo "***   EXPECTED"
+  fi
+  lava-send test || exit 1
+  if lava-wait-all test sender; then
+    echo "lava-wait-all (role bounded) succeeded with preceeding send"
+    echo "***   EXPECTED"
+  else
+    echo "lava-wait-all (role bounded) failed    with preceeding send"
+    echo "*** UNEXPECTED"
+    exit 1
+  fi
+  if lava-wait-all test; then
+    echo "lava-wait-all (unbounded)    succeeded even though skulker did not send message"
+    echo "*** UNEXPECTED"
+    exit 1
+  else
+    echo "lava-wait-all (unbounded)    failed               (skulker did not send message)"
+    echo "***   EXPECTED"
+  fi
+elif test x"`lava-role`" = xskulker; then
+  echo "*** SKULKER WILL NOT SEND TEST MESSGE"
+else
+  echo "*** UNKNOWN ROLE '`lava-role`'"
+  exit 1
+fi
+
+#finish
+echo "*** DONE"
+lava-sync alldone
+exit 0
diff --git a/test-lava-wait-all.yaml b/test-lava-wait-all.yaml
new file mode 100644
index 0000000..69f9479
--- /dev/null
+++ b/test-lava-wait-all.yaml
@@ -0,0 +1,9 @@
+metadata:
+  name: multinode-test
+  format: "Lava-Test-Shell Test Definition 1.0"
+  description: "MultiNode Test"
+  version: 1.0
+
+run:
+    steps:
+        - ./test-lava-wait-all.sh
diff --git a/test.json b/test.json
index 49030c0..ded154e 100644
--- a/test.json
+++ b/test.json
@@ -14,8 +14,20 @@
       "testdef_repos": [
       {
         "git-repo": "https://git.linaro.org/people/bernie.ogden/multinode-testcase",
-        "testdef": "test.yaml"
-      }]
+        "testdef": "test-lava-network.yaml"
+      }],
+      "timeout": 120
+    }
+  },
+  {
+    "command": "lava_test_shell",
+    "parameters": {
+      "testdef_repos": [
+      {
+        "git-repo": "https://git.linaro.org/people/bernie.ogden/multinode-testcase",
+        "testdef": "test-lava-wait-all.yaml"
+      }],
+      "timeout": 120
     }
   },
   {