X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fapplication.py;h=b6ccb6f125d01e0e5bd1ee4b28f87619fda100bc;hb=d50ba1a08e541ded7a8b322493ebb1d0cc59c6ff;hp=68ad474dd6e897b4af9c57b0a2bc774dbe242c25;hpb=d83307efc3a24a5d5b307bfb6d575368d1a10f64;p=nepi.git diff --git a/test/resources/linux/application.py b/test/resources/linux/application.py index 68ad474d..b6ccb6f1 100755 --- a/test/resources/linux/application.py +++ b/test/resources/linux/application.py @@ -45,13 +45,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 +73,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) @@ -111,10 +111,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 +129,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") @@ -150,15 +150,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") + app = ec.register_resource("linux::Application") cmd = "ping -c5 %s" % self.target ec.set(app, "command", cmd) ec.register_connection(app, node) @@ -194,19 +194,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 +228,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 +276,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 +310,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 +359,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)