X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fserialization.py;h=71651a3bb2f7a901a4336422953c70fd9a5df9f9;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=c133ab36c0180ad76eb5f94e400cd3d21da17d4d;hpb=6096716dbc88a1d9e6a1be8cac477006225d890e;p=nepi.git

diff --git a/test/resources/linux/serialization.py b/test/resources/linux/serialization.py
index c133ab36..71651a3b 100755
--- a/test/resources/linux/serialization.py
+++ b/test/resources/linux/serialization.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
@@ -47,19 +46,19 @@ class LinuxSerializationTestCase(unittest.TestCase):
 
         ec = ExperimentController(exp_id="test-condition-serial")
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", host)
         ec.set(node, "username", user)
-        ec.set(node, "cleanHome", True)
+        ec.set(node, "cleanExperiment", True)
         ec.set(node, "cleanProcesses", True)
 
-        server = ec.register_resource("LinuxApplication")
+        server = ec.register_resource("linux::Application")
         cmd = "echo 'HOLA' | nc -l 3333"
         ec.set(server, "command", cmd)
         ec.set(server, "depends", depends)
         ec.register_connection(server, node)
 
-        client = ec.register_resource("LinuxApplication")
+        client = ec.register_resource("linux::Application")
         cmd = "nc 127.0.0.1 3333"
         ec.set(client, "command", cmd)
         ec.register_connection(client, node)
@@ -89,7 +88,7 @@ class LinuxSerializationTestCase(unittest.TestCase):
         ec2.deploy()
         ec2.wait_finished(apps)
         
-        self.assertEquals(len(ec.resources), len(ec2.resources))
+        self.assertEqual(len(ec.resources), len(ec2.resources))
         
         self.assertTrue(ec2.state(node) == ResourceState.STARTED)
         self.assertTrue(ec2.state(server) == ResourceState.STOPPED)