chore: cleanup same tests, and spread to another layer

Signed-off-by: aavarghese <[email protected]>
IBM · Aug 20, 2024 · 41ebaf4 · 41ebaf4
1 parent f802462
commit 41ebaf4
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 142 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,7 +19,8 @@ jobs:
       matrix:
         SCRIPT:
           - ./tests/bin/ci.sh -e 'test(7.*|8.*)' # baseline tests
-          - ./tests/bin/ci.sh -i 'test7.*' -e 'test7f.*'
+          - ./tests/bin/ci.sh -i 'test7.*' -e 'test7(b.*|c.*|d.*|e.*|f.*|g.*|h.*)'
+          - ./tests/bin/ci.sh -i 'test7(b.*|c.*|d.*|e.*|g.*|h.*)' 
           - ./tests/bin/ci.sh -i 'test7f.*'
           - ./tests/bin/ci.sh -i 'test8.*'
           - ./tests/bin/go.sh

diff --git a/tests/tests/test7-wait-withfail/README.md b/tests/tests/test7-wait-withfail/README.md
diff --git a/tests/tests/test7-wait-withfail/add-data-to-queue.sh b/tests/tests/test7-wait-withfail/add-data-to-queue.sh
diff --git a/tests/tests/test7-wait-withfail/init.sh b/tests/tests/test7-wait-withfail/init.sh
diff --git a/tests/tests/test7-wait-withfail/pail/app.yaml b/tests/tests/test7-wait-withfail/pail/app.yaml
diff --git a/tests/tests/test7-wait-withfail/pail/dataset-secret.yaml b/tests/tests/test7-wait-withfail/pail/dataset-secret.yaml
diff --git a/tests/tests/test7-wait-withfail/pail/dispatcher.yaml b/tests/tests/test7-wait-withfail/pail/dispatcher.yaml
diff --git a/tests/tests/test7-wait-withfail/pail/pool1.yaml b/tests/tests/test7-wait-withfail/pail/pool1.yaml
diff --git a/tests/tests/test7-wait-withfail/pail/version b/tests/tests/test7-wait-withfail/pail/version
diff --git a/tests/tests/test7-wait-withfail/settings.sh b/tests/tests/test7-wait-withfail/settings.sh
diff --git a/tests/tests/test7-wait/README.md b/tests/tests/test7-wait/README.md
@@ -1,3 +1,3 @@
 # test7-wait
 
-Same as test7, except this test uses the ParameterSweep in "wait" mode.
+Same as test7, except this test uses the ParameterSweep in "wait" mode with one failing task.
diff --git a/tests/tests/test7-wait/pail/app.yaml b/tests/tests/test7-wait/pail/app.yaml
@@ -20,8 +20,13 @@ spec:
         N=$(ls $dataset_name/$bucket_name/$folder_name | wc -l | xargs)
 
         echo "Processing $N $(basename $in)"
-        sleep 5
 
+        if [ $(basename $in) = "task.3.txt" ]
+          then
+            echo "Error!" 1>&2
+            exit 64
+        fi
+        
         echo "Done with $(basename $in)"
 
   command: ./main.sh

diff --git a/tests/tests/test7-wait/settings.sh b/tests/tests/test7-wait/settings.sh
@@ -4,4 +4,5 @@ taskqueue=test7-wait
 # /queue/0,1 <-- 2 workers
 # task.1,task.3,task.5 <-- 3 tasks per iter
 
-expected=("Processing 6 task.1.txt" "Task completed task.1.txt" "Task completed task.1.txt with return code 0" "Task completed task.3.txt" "Task completed task.3.txt with return code 0")
+expected=("Processing 6 task.1.txt" "Task completed task.1.txt" "Task completed task.1.txt with return code 0" "Task completed task.3.txt" "Task completed task.3.txt with return code 64")
+expectTaskFailure=64