Merge branch 'master' into feat/json-output

Author: Vasileios Karakasis

config/cscs-ci.py

@@ -55,7 +55,7 @@
             'hostnames': [
                 'dom'
             ],
-            'modules_system': 'tmod',
+            'modules_system': 'tmod4',
             'resourcesdir': '/apps/common/UES/reframe/resources',
             'partitions': [
                 {

config/cscs.py

@@ -285,7 +285,7 @@
             'hostnames': [
                 'dom'
             ],
-            'modules_system': 'tmod',
+            'modules_system': 'tmod4',
             'resourcesdir': '/apps/common/UES/reframe/resources',
             'partitions': [
                 {
@@ -317,7 +317,7 @@
                         {
                             'type': 'Singularity',
                             'modules': [
-                                'singularity'
+                                'singularity/3.5.3'
                             ]
                         }
                     ],
@@ -358,7 +358,7 @@
                         {
                             'type': 'Singularity',
                             'modules': [
-                                'singularity'
+                                'singularity/3.5.3'
                             ]
                         }
                     ],

reframe/frontend/executors/policies.py

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 import contextlib
+import functools
 import itertools
 import math
 import sys
@@ -17,6 +18,10 @@
                                         TaskEventListener, ABORT_REASONS)
 
 
+def dictlist_len(d):
+    return functools.reduce(lambda l, r: l + len(r), d.values(), 0)
+
+
 def _cleanup_all(tasks, *args, **kwargs):
     for task in tasks:
         if task.ref_count == 0:
@@ -416,7 +421,8 @@ def exit(self):
         pollrate = PollRateFunction(0.2, 60)
         num_polls = 0
         t_start = datetime.now()
-        while (self._running_tasks or self._waiting_tasks):
+        while (self._running_tasks or self._waiting_tasks or
+               self._completed_tasks or dictlist_len(self._ready_tasks)):
             getlogger().debug('running tasks: %s' % len(self._running_tasks))
             num_polls += len(self._running_tasks)
             try: