X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fmultirun.py;h=2d4568a8fe89087f1fe35af59664036e3611f104;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=d548bd2c742d43c22961c3fdf5395eda4ce8c2a6;hpb=a3e02ea08e65fabe6104d4ba30ee635c42ebd4d1;p=nepi.git

diff --git a/test/resources/linux/multirun.py b/test/resources/linux/multirun.py
index d548bd2c..2d4568a8 100755
--- a/test/resources/linux/multirun.py
+++ b/test/resources/linux/multirun.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
@@ -49,22 +48,21 @@ class LinuxMultiRunTestCase(unittest.TestCase):
 
         dirpath = tempfile.mkdtemp()
 
-        ec = ExperimentController(exp_id="test-condition-multirun")
+        ec = ExperimentController(exp_id = "test-condition-multirun", 
+                local_dir = dirpath)
         
-        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)
 
-        ping = ec.register_resource("LinuxApplication")
+        ping = ec.register_resource("linux::Application")
         ec.set(ping, "command", "ping -c10 nepi.inria.fr")
         ec.register_connection(ping, node)
 
         collector = ec.register_resource("Collector")
         ec.set(collector, "traceName", "stdout")
-        ec.set(collector, "storeDir", dirpath)
-        ec.set(collector, "useRunId", True)
         ec.register_connection(ping, collector)
 
         def compute_metric_callback(ping, ec, run):
@@ -87,14 +85,15 @@ class LinuxMultiRunTestCase(unittest.TestCase):
         self.assertTrue(runs >= 5)
 
         dircount = 0
-        for d in os.listdir(dirpath):
-            path = os.path.join(dirpath, d)
+
+        for d in os.listdir(ec.exp_dir):
+            path = os.path.join(ec.exp_dir, d)
             if os.path.isdir(path):
                 dircount += 1
                 logs = glob.glob(os.path.join(path, "*.stdout"))
-                self.assertEquals(len(logs), 1)
+                self.assertEqual(len(logs), 1)
         
-        self.assertEquals(runs, dircount)
+        self.assertEqual(runs, dircount)
 
         shutil.rmtree(dirpath)