EC wait_finished needs to wait for FINISHED, FAILED and STOPPED

diff --git a/src/nepi/execution/ec.py b/src/nepi/execution/ec.py
index 90cf710..56839b5 100644 (file)
--- a/src/nepi/execution/ec.py
+++ b/src/nepi/execution/ec.py
@@ -94,7 +94,9 @@ class ExperimentController(object):
         return self.ecstate in [ECState.FAILED, ECState.TERMINATED]
 
     def wait_finished(self, guids):
         return self.ecstate in [ECState.FAILED, ECState.TERMINATED]
 
     def wait_finished(self, guids):

-        while not all([self.state(guid) == ResourceState.FINISHED \
+        while not all([self.state(guid) in [ResourceState.FINISHED, 
+            ResourceState.STOPPED, 
+            ResourceState.FAILED] \

                 for guid in guids]) and not self.finished:
             # We keep the sleep as large as possible to 
             # decrese the number of RM state requests
                 for guid in guids]) and not self.finished:
             # We keep the sleep as large as possible to 
             # decrese the number of RM state requests

diff --git a/src/nepi/execution/resource.py b/src/nepi/execution/resource.py
index f41b070..ecd47e4 100644 (file)
--- a/src/nepi/execution/resource.py
+++ b/src/nepi/execution/resource.py
@@ -23,7 +23,7 @@ from nepi.execution.trace import TraceAttr
 
 import copy
 import functools
 
 import copy
 import functools

-import inspect
+import logging

 import os
 import pkgutil
 import weakref
 import os
 import pkgutil
 import weakref


@@ -614,6 +614,7 @@ def find_types():
                     types.append(attr)
         except:
             import traceback
                     types.append(attr)
         except:
             import traceback

+            import logging

             err = traceback.format_exc()
             logger = logging.getLogger("Resource.find_types()")
             logger.error("Error while lading Resource Managers %s" % err)
             err = traceback.format_exc()
             logger = logging.getLogger("Resource.find_types()")
             logger.error("Error while lading Resource Managers %s" % err)