X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Finterface.py;h=0141d4c996b6541bef421dde8003d371fbe3a755;hb=e55924b6886bd7382a28e1ae235c4810f852e163;hp=0f332f37a09e6d385ee36402ff6bfe90dd0439e4;hpb=4c64cfa394d6210febf4c384276820093b104106;p=nepi.git

diff --git a/test/resources/linux/interface.py b/test/resources/linux/interface.py
index 0f332f37..0141d4c9 100755
--- a/test/resources/linux/interface.py
+++ b/test/resources/linux/interface.py
@@ -4,9 +4,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -50,12 +49,12 @@ class LinuxInterfaceTestCase(unittest.TestCase):
 
         ec = ExperimentController()
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", host)
         ec.set(node, "username", user)
 
-        iface = ec.register_resource("LinuxInterface")
-        chan = ec.register_resource("LinuxChannel")
+        iface = ec.register_resource("linux::Interface")
+        chan = ec.register_resource("linux::Channel")
 
         ec.register_connection(iface, node)
         ec.register_connection(iface, chan)
@@ -63,7 +62,7 @@ class LinuxInterfaceTestCase(unittest.TestCase):
         ec.deploy()
 
         while not all([ ec.state(guid) == ResourceState.STARTED \
-                for guid in [node, iface]]) and not ec.finished:
+                for guid in [node, iface]]):
             time.sleep(0.5)
 
         self.assertTrue(ec.state(node) == ResourceState.STARTED)