X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Finterface.py;h=f94c7e6e9a34abdce87ecbe60e64acdc7bc0fec3;hb=6337302c0db631641b3e6a47c6e57c4864711acc;hp=7b914d277b34cc72386e702c8aae97efe9ad4a1a;hpb=b849b5d9bd2569b1db4dce2a65296e1c619bd0a7;p=nepi.git

diff --git a/test/resources/linux/interface.py b/test/resources/linux/interface.py
index 7b914d27..f94c7e6e 100644
--- a/test/resources/linux/interface.py
+++ b/test/resources/linux/interface.py
@@ -41,19 +41,17 @@ class LinuxInterfaceTestCase(unittest.TestCase):
         ec.register_connection(iface, node)
         ec.register_connection(iface, chan)
 
-        try:
-            ec.deploy()
+        ec.deploy()
 
-            while not all([ ec.state(guid) == ResourceState.STARTED \
-                    for guid in [node, iface]]):
-                time.sleep(0.5)
+        while not all([ ec.state(guid) == ResourceState.STARTED \
+                for guid in [node, iface]]) and not ec.finished:
+            time.sleep(0.5)
 
-            self.assertTrue(ec.state(node) == ResourceState.STARTED)
-            self.assertTrue(ec.state(iface) == ResourceState.STARTED)
-            self.assertTrue(ec.get(iface, "deviceName") == "eth0")
+        self.assertTrue(ec.state(node) == ResourceState.STARTED)
+        self.assertTrue(ec.state(iface) == ResourceState.STARTED)
+        self.assertTrue(ec.get(iface, "deviceName") == "eth0")
 
-        finally:
-            ec.shutdown()
+        ec.shutdown()
 
     def test_deploy_fedora(self):
         self.t_deploy(self.fedora_host, self.fedora_user)