X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fapplication.py;h=cdd6fe7f8aa43d829f427aee854c8ae9ca355693;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=68ad474dd6e897b4af9c57b0a2bc774dbe242c25;hpb=d83307efc3a24a5d5b307bfb6d575368d1a10f64;p=nepi.git diff --git a/test/resources/linux/application.py b/test/resources/linux/application.py index 68ad474d..cdd6fe7f 100755 --- a/test/resources/linux/application.py +++ b/test/resources/linux/application.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 @@ -45,13 +44,13 @@ class LinuxApplicationTestCase(unittest.TestCase): ec = ExperimentController(exp_id = "test-stdout") - 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) - app = ec.register_resource("LinuxApplication") + app = ec.register_resource("linux::Application") cmd = "echo 'HOLA'" ec.set(app, "command", cmd) ec.register_connection(app, node) @@ -73,13 +72,13 @@ class LinuxApplicationTestCase(unittest.TestCase): ec = ExperimentController(exp_id = "test-ping") - 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) - app = ec.register_resource("LinuxApplication") + app = ec.register_resource("linux::Application") cmd = "ping -c5 %s" % self.target ec.set(app, "command", cmd) @@ -94,15 +93,15 @@ class LinuxApplicationTestCase(unittest.TestCase): stdout = ec.trace(app, "stdout") size = ec.trace(app, "stdout", attr = TraceAttr.SIZE) - self.assertEquals(len(stdout), size) + self.assertEqual(len(stdout), size) block = ec.trace(app, "stdout", attr = TraceAttr.STREAM, block = 5, offset = 1) - self.assertEquals(block, stdout[5:10]) + self.assertEqual(block, stdout[5:10]) path = ec.trace(app, "stdout", attr = TraceAttr.PATH) rm = ec.get_resource(app) p = os.path.join(rm.run_home, "stdout") - self.assertEquals(path, p) + self.assertEqual(path, p) ec.shutdown() @@ -111,10 +110,10 @@ class LinuxApplicationTestCase(unittest.TestCase): ec = ExperimentController(exp_id = "tests-code") - 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) prog = """#include @@ -129,7 +128,7 @@ main (void) cmd = "${RUN_HOME}/hello" build = "gcc -Wall -x c ${APP_HOME}/code -o hello" - app = ec.register_resource("LinuxApplication") + app = ec.register_resource("linux::Application") ec.set(app, "command", cmd) ec.set(app, "code", prog) ec.set(app, "depends", "gcc") @@ -141,7 +140,7 @@ main (void) ec.wait_finished(app) out = ec.trace(app, 'stdout') - self.assertEquals(out, "Hello, world!\n") + self.assertEqual(out, "Hello, world!\n") ec.shutdown() @@ -150,15 +149,15 @@ main (void) ec = ExperimentController(exp_id="test-concurrency") - 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) apps = list() - for i in xrange(50): - app = ec.register_resource("LinuxApplication") + for i in range(50): + app = ec.register_resource("linux::Application") cmd = "ping -c5 %s" % self.target ec.set(app, "command", cmd) ec.register_connection(app, node) @@ -177,15 +176,15 @@ main (void) for app in apps: stdout = ec.trace(app, 'stdout') size = ec.trace(app, 'stdout', attr = TraceAttr.SIZE) - self.assertEquals(len(stdout), size) + self.assertEqual(len(stdout), size) block = ec.trace(app, 'stdout', attr = TraceAttr.STREAM, block = 5, offset = 1) - self.assertEquals(block, stdout[5:10]) + self.assertEqual(block, stdout[5:10]) path = ec.trace(app, 'stdout', attr = TraceAttr.PATH) rm = ec.get_resource(app) p = os.path.join(rm.run_home, 'stdout') - self.assertEquals(path, p) + self.assertEqual(path, p) ec.shutdown() @@ -194,19 +193,19 @@ main (void) ec = ExperimentController(exp_id="test-condition") - 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) @@ -228,84 +227,21 @@ main (void) ec.shutdown() - @skipIfNotAlive - def t_condition_serialize(self, host, user, depends): - - dirpath = tempfile.mkdtemp() - - ec = ExperimentController(exp_id="test-condition-serial") - - node = ec.register_resource("LinuxNode") - ec.set(node, "hostname", host) - ec.set(node, "username", user) - ec.set(node, "cleanHome", True) - ec.set(node, "cleanProcesses", True) - - server = ec.register_resource("LinuxApplication") - 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") - cmd = "nc 127.0.0.1 3333" - ec.set(client, "command", cmd) - ec.register_connection(client, node) - - ec.register_condition(client, ResourceAction.START, server, ResourceState.STARTED) - - apps = [client, server] - - filepath = ec.save(dirpath) - - ec.deploy() - - ec.wait_finished(apps) - - self.assertTrue(ec.state(node) == ResourceState.STARTED) - self.assertTrue(ec.state(server) == ResourceState.STOPPED) - self.assertTrue(ec.state(client) == ResourceState.STOPPED) - - stdout = ec.trace(client, "stdout") - self.assertTrue(stdout.strip() == "HOLA") - - ec.shutdown() - - # Load serialized experiment - ec2 = ExperimentController.load(filepath) - - ec2.deploy() - ec2.wait_finished(apps) - - self.assertEquals(len(ec.resources), len(ec2.resources)) - - self.assertTrue(ec2.state(node) == ResourceState.STARTED) - self.assertTrue(ec2.state(server) == ResourceState.STOPPED) - self.assertTrue(ec2.state(client) == ResourceState.STOPPED) - - stdout = ec2.trace(client, "stdout") - - self.assertTrue(stdout.strip() == "HOLA") - - ec2.shutdown() - - shutil.rmtree(dirpath) - @skipIfNotAlive def t_http_sources(self, host, user): ec = ExperimentController(exp_id="test-http-sources") - 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) sources = "http://yans.pl.sophia.inria.fr/code/nef/archive/tip.tar.gz;" \ "http://yans.pl.sophia.inria.fr/code/nef/raw-file/8ace577d4079/src/nef/images/menu/connect.png" - app = ec.register_resource("LinuxApplication") + app = ec.register_resource("linux::Application") ec.set(app, "sources", sources) command = "ls ${SRC}" @@ -339,13 +275,13 @@ main (void) ec = ExperimentController(exp_id="test-xterm") - 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) - app = ec.register_resource("LinuxApplication") + app = ec.register_resource("linux::Application") ec.set(app, "command", "xterm") ec.set(app, "depends", "xterm") ec.set(app, "forwardX11", True) @@ -373,13 +309,13 @@ main (void) ec = ExperimentController(exp_id="test-copyfile") - 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) - app = ec.register_resource("LinuxApplication") + app = ec.register_resource("linux::Application") ec.set(app, "command", "ls ${SRC}") ec.set(app, "sources", "%s;%s" % (dirpath, f1.name)) ec.register_connection(app, node) @@ -422,12 +358,6 @@ main (void) def test_condition_ubuntu(self): self.t_condition(self.ubuntu_host, self.ubuntu_user, "netcat") - def test_condition_serialize_fedora(self): - self.t_condition_serialize(self.fedora_host, self.fedora_user, "nc") - - def test_condition_serialize_ubuntu(self): - self.t_condition_serialize(self.ubuntu_host, self.ubuntu_user, "netcat") - def test_http_sources_fedora(self): self.t_http_sources(self.fedora_host, self.fedora_user)