Fix for cylc/cylc-flow#2218

Jobs now die with EXIT instead of ERR.
matthewrmshin · Mar 30, 2017 · 72ba260 · 72ba260
1 parent dd5d2c3
commit 72ba260
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/html/template/rose-bush/job-entry.html b/lib/html/template/rose-bush/job-entry.html
@@ -59,7 +59,7 @@
       <a href="{{taskjobs_link}}&amp;job_status=failed"
       class="label label-danger">
         <i class="glyphicon glyphicon-remove-circle" title="failed"></i>
-        {% if entry.run_signal and entry.run_signal != "ERR" -%}
+        {% if entry.run_signal and entry.run_signal not in ["ERR", "EXIT"] -%}
           {{entry.run_signal}}
         {% endif -%}
       </a>

diff --git a/t/rose-bush/10-jobs-task-status.t b/t/rose-bush/10-jobs-task-status.t
@@ -91,21 +91,21 @@ rose_ws_json_greps "${TEST_KEY}.out" "${TEST_KEY}.out" \
     "[('job_status',), None]" \
     "[('entries', ${FOO1}, 'task_status',), 'succeeded']" \
     "[('entries', ${FOO1}, 'run_status',), 1]" \
-    "[('entries', ${FOO1}, 'run_signal',), 'ERR']" \
+    "[('entries', ${FOO1}, 'run_signal',), 'EXIT']" \
     "[('entries', ${FOO2}, 'task_status',), 'succeeded']" \
     "[('entries', ${FOO2}, 'run_status',), 1]" \
-    "[('entries', ${FOO2}, 'run_signal',), 'ERR']" \
+    "[('entries', ${FOO2}, 'run_signal',), 'EXIT']" \
     "[('entries', ${FOO3}, 'task_status',), 'succeeded']" \
     "[('entries', ${FOO3}, 'run_status',), 0]" \
     "[('entries', ${BAR1}, 'task_status',), 'failed']" \
     "[('entries', ${BAR1}, 'run_status',), 1]" \
-    "[('entries', ${BAR1}, 'run_signal',), 'ERR']" \
+    "[('entries', ${BAR1}, 'run_signal',), 'EXIT']" \
     "[('entries', ${BAR2}, 'task_status',), 'failed']" \
     "[('entries', ${BAR2}, 'run_status',), 1]" \
-    "[('entries', ${BAR2}, 'run_signal',), 'ERR']" \
+    "[('entries', ${BAR2}, 'run_signal',), 'EXIT']" \
     "[('entries', ${BAR3}, 'task_status',), 'failed']" \
     "[('entries', ${BAR3}, 'run_status',), 1]" \
-    "[('entries', ${BAR3}, 'run_signal',), 'ERR']" \
+    "[('entries', ${BAR3}, 'run_signal',), 'EXIT']" \
     "[('entries', ${BAZ1}, 'task_status',), 'succeeded']" \
     "[('entries', ${BAZ1}, 'submit_status',), 1]" \
     "[('entries', ${BAZ1}, 'run_status',), None]" \

diff --git a/t/rose-task-run/30-app-arch-opt-source.t b/t/rose-task-run/30-app-arch-opt-source.t
@@ -38,7 +38,7 @@ file_grep "${TEST_KEY}-archive1-01" \
     'CYLC_JOB_EXIT=SUCCEEDED' \
     "${SUITE_RUN_DIR}/log/job/1/archive1/01/job.status"
 file_grep "${TEST_KEY}-archive2-01" \
-    'CYLC_JOB_EXIT=ERR' \
+    'CYLC_JOB_EXIT=EXIT' \
     "${SUITE_RUN_DIR}/log/job/1/archive2/01/job.status"
 file_grep "${TEST_KEY}-archive2-02" \
     'CYLC_JOB_EXIT=SUCCEEDED' \