Fix task progress percentage with failed tasks

Signed-off-by: Ben Sherman <[email protected]>

Author: bentsherman

modules/nextflow/src/main/groovy/nextflow/trace/AnsiLogObserver.groovy

@@ -475,8 +475,8 @@ class AnsiLogObserver implements TraceObserver {
             term.a(Attribute.INTENSITY_FAINT).a(", cached: $stats.cached").reset()
         if( stats.stored )
             term.a(", stored: $stats.stored")
-        if( stats.failed )
-            term.a(", failed: $stats.failed")
+        if( stats.ignored )
+            term.a(", ignored: $stats.ignored")
         if( stats.retries )
             term.a(", retries: $stats.retries")
         // Show red cross ('✘') or green tick ('✔') according to status

modules/nextflow/src/main/groovy/nextflow/trace/ProgressRecord.groovy

@@ -62,12 +62,11 @@ class ProgressRecord implements Cloneable {
     }
 
     int getTotalCount() {
-        pending+ submitted+ running+
-           succeeded+ failed+ cached+ stored + aborted
+        pending + submitted + running + succeeded + ignored + cached + stored + aborted
     }
 
     int getCompletedCount() {
-        succeeded+ failed+ cached+ stored
+        succeeded + ignored + cached + stored
     }
 
     @Override

modules/nextflow/src/test/groovy/nextflow/trace/ProgressRecordTest.groovy

@@ -53,30 +53,32 @@ class ProgressRecordTest extends Specification {
 
     def 'should get counts' () {
         given:
-        def PENDING =1
-        def SUBMITTED =2
-        def RUNNING =3
-        def SUCCEEDED =4
-        def FAILED =5
-        def CACHED =6
-        def STORED =7
-        def ABORTED = 8
+        def PENDING = 1
+        def SUBMITTED = 2
+        def RUNNING = 3
+        def SUCCEEDED = 4
+        def FAILED = 5
+        def IGNORED = 6
+        def CACHED = 7
+        def STORED = 8
+        def ABORTED = 9
         and:
         def rec = new ProgressRecord(10, 'foo')
 
         when:
-        rec.pending =PENDING
-        rec.submitted =SUBMITTED
-        rec.running =RUNNING
-        rec.succeeded =SUCCEEDED
-        rec.failed =FAILED
-        rec.cached =CACHED
-        rec.stored =STORED
+        rec.pending = PENDING
+        rec.submitted = SUBMITTED
+        rec.running = RUNNING
+        rec.succeeded = SUCCEEDED
+        rec.failed = FAILED
+        rec.ignored = IGNORED
+        rec.cached = CACHED
+        rec.stored = STORED
         rec.aborted = ABORTED
 
         then:
-        rec.getCompletedCount() == SUCCEEDED+ FAILED+ CACHED+ STORED
-        rec.getTotalCount() == PENDING+ SUBMITTED+ RUNNING + SUCCEEDED+ FAILED+ CACHED+ STORED+ ABORTED
+        rec.getCompletedCount() == SUCCEEDED + IGNORED + CACHED + STORED
+        rec.getTotalCount() == PENDING + SUBMITTED + RUNNING  + SUCCEEDED + IGNORED + CACHED + STORED + ABORTED
     }