Changing ResourceManager naming for platform::ResourceName

[nepi.git] / test / resources / linux / interface.py

diff --git a/test/resources/linux/interface.py b/test/resources/linux/interface.py
index 6b1f549..4fe2883 100755 (executable)
--- a/test/resources/linux/interface.py
+++ b/test/resources/linux/interface.py
@@ -35,11 +35,10 @@ import unittest
 class LinuxInterfaceTestCase(unittest.TestCase):
     def setUp(self):
         self.fedora_host = "nepi2.pl.sophia.inria.fr"
-        self.fedora_host = "planetlab2.u-strasbg.fr"
-        self.fedora_user = 'inria_nepi'
+        self.fedora_user = "inria_nepi"
 
-        self.ubuntu_host = 'roseval.pl.sophia.inria.fr'
-        self.ubuntu_user = 'alina'
+        self.ubuntu_host = "roseval.pl.sophia.inria.fr"
+        self.ubuntu_user = "alina"
 
     @skipIfNotAlive
     def t_deploy(self, host, user):
@@ -51,12 +50,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)
@@ -64,7 +63,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)