Do not record cancelled tests

Author: sfc-gh-kmakino

joshua/joshua_agent.py

@@ -110,25 +110,6 @@ def stopAgent():
     return stop_agent
 
 
-def trim_jobqueue(cutoff_date, remove_jobs=True):
-    global job_queue
-    jobs_pass = 0
-    jobs_fail = 0
-    cutoff_string = joshua_model.format_datetime(cutoff_date)
-
-    for job_record in list(job_queue.queue):
-        (result, job_date) = fdb.tuple.unpack(job_record)
-        if job_date <= cutoff_string:
-            if remove_jobs:
-                old_record = job_queue.get_nowait()
-        elif result == 0:
-            jobs_pass += 1
-        else:
-            jobs_fail += 1
-
-    return (jobs_pass + jobs_fail, jobs_pass, jobs_fail)
-
-
 def log(outputText, newline=True):
     return (
         print(outputText, file=getFileHandle())
@@ -320,7 +301,8 @@ def remove_old_artifacts(path, age=24 * 60 * 60):
 
 # Returns whether the artifacts should be saved based on run state.
 def should_save(retcode, save_on="FAILURE"):
-    return save_on == "ALWAYS" or save_on == "FAILURE" and retcode != 0
+    # do not save when cancelled (retcode == -1)
+    return save_on == "ALWAYS" or save_on == "FAILURE" and retcode != 0 and retcode != -1
 
 
 # Removes artifacts from the current run, saving them if necessary.
@@ -411,7 +393,6 @@ def run_ensemble(
         :param sanity:
         :return: 0 for success
         """
-        global jobs_pass, jobs_fail
         if not work_dir:
             raise JoshuaError(
                 "Unable to run function since work_dir is not defined. Exiting. (CWD="
@@ -556,6 +537,11 @@ def run_ensemble(
 
         cleanup(ensemble, where, seed, retcode, save_on, work_dir=work_dir)
 
+        if retcode == -1:
+            # no results to record when cancelled
+            self._retcode = retcode
+            return
+
         try:
             joshua_model.insert_results(
                 ensemble,
@@ -582,17 +568,6 @@ def run_ensemble(
                 duration,
             )
 
-        # Add the result to the job queue
-        job_queue.put(fdb.tuple.pack((retcode, done_timestamp)))
-
-        # Update the job counts
-        job_mutex.acquire()
-        if retcode == 0:
-            jobs_pass += 1
-        else:
-            jobs_fail += 1
-        job_mutex.release()
-
         self._retcode = retcode
 
 

tests/sanity_test_script.sh

@@ -81,12 +81,12 @@ tar czf test.tar.gz joshua_test joshua_timeout
 
 mkdir /tmp/work
 
-total=0
-pass=0
-fail=0
+total_tests=0
+total_passed=0
+total_failed=0
 
 for test in one_agent two_agent two_agent_kill_one; do
-    (( total++ ))
+    (( total_tests++ ))
     echo "=== TEST: ${test} ==="
     python -m joshua.joshua start --tarball test.tar.gz --max-runs 6
     python -m joshua.joshua list
@@ -107,17 +107,17 @@ for test in one_agent two_agent two_agent_kill_one; do
     done
     if [ $pass -eq $ended ] && [ $ended -eq $max_runs ]; then
 	echo "Pass: pass:$pass ended:$ended max_runs:$max_runs"
-	(( pass++ ))
+	(( total_passed++ ))
     else
 	echo "Fail: pass:$pass ended:$ended max_runs:$max_runs"
-	(( fail++ ))
+	(( total_failed++ ))
     fi
     python -m joshua.joshua delete -y ${ensemble}
 done
 
 # timeout test
 for test in two_agent; do
-    (( total++ ))
+    (( total_tests++ ))
     echo "=== TEST: ${test} TIMEOUT ==="
     python -m joshua.joshua start --tarball test.tar.gz --max-runs 6 --timeout 2
     python -m joshua.joshua list
@@ -135,17 +135,17 @@ for test in two_agent; do
     done
     if [ $fail -eq $ended ] && [ $fail -eq 2 ]; then
 	echo "Pass: fail:$fail == ended:$ended"
-	(( pass++ ))
+	(( total_passed++ ))
     else
 	echo "Fail: fail:$fail != ended:$ended or fail:$fail != 2"
-	(( fail++ ))
+	(( total_failed++ ))
     fi
     python -m joshua.joshua delete -y ${ensemble}
 done
 
 kill -9 ${fdbpid}
 
-echo "${pass} / ${total} passed"
+echo "${total_passed} / ${total_tests} passed"
 
-exit $fail
+exit $total_failed