X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fexecution%2Fresource.py;h=128c6df8bfa6e3f4ed8b5b6e331aef5a66d80199;hb=6337302c0db631641b3e6a47c6e57c4864711acc;hp=8f5a2b5c033462d0e443eb184873b04055e6c715;hpb=b849b5d9bd2569b1db4dce2a65296e1c619bd0a7;p=nepi.git

diff --git a/test/execution/resource.py b/test/execution/resource.py
index 8f5a2b5c..128c6df8 100755
--- a/test/execution/resource.py
+++ b/test/execution/resource.py
@@ -147,15 +147,14 @@ class ResourceManagerTestCase(unittest.TestCase):
         ec.register_connection(iface1, chan)
         ec.register_connection(iface2, chan)
 
-        try:
-            ec.deploy()
+        ec.deploy()
 
-            while not all([ ec.state(guid) == ResourceState.STARTED \
-                    for guid in [app1, app2, node1, node2, iface1, iface2, chan]]):
-                time.sleep(0.5)
+        while not all([ ec.state(guid) == ResourceState.STARTED \
+                for guid in [app1, app2, node1, node2, iface1, iface2, chan]]) \
+                and not ec.finished:
+            time.sleep(0.5)
 
-        finally:
-            ec.shutdown()
+        ec.shutdown()
 
         rmapp1 = ec.get_resource(app1)
         rmapp2 = ec.get_resource(app2)