X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fapplication.py;h=f98c1c698c86b7749098ac0465e7c6a98c969b42;hb=342187d6e7ce34d4fdf403952637659b93aa4bee;hp=a1f1397b1a18a75747133e02703b1b9fe3e1fdaf;hpb=1e2eb157cb569e9c28a5b7888ed97076d27414cb;p=nepi.git diff --git a/test/resources/linux/application.py b/test/resources/linux/application.py index a1f1397b..f98c1c69 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 @@ -32,26 +31,26 @@ import unittest class LinuxApplicationTestCase(unittest.TestCase): def setUp(self): - self.fedora_host = "nepi2.pl.sophia.inria.fr" + self.fedora_host = "fedora.pl.sophia.inria.fr" self.fedora_user = "inria_nepi" - self.ubuntu_host = "roseval.pl.sophia.inria.fr" + self.ubuntu_host = "ubuntu.pl.sophia.inria.fr" self.ubuntu_user = "inria_nepi" - self.target = "nepi5.pl.sophia.inria.fr" + self.target = "nepi.pl.sophia.inria.fr" @skipIfNotAlive def t_stdout(self, host, user): 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) @@ -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") @@ -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") + app = ec.register_resource("linux::Application") cmd = "ping -c5 %s" % self.target ec.set(app, "command", cmd) ec.register_connection(app, node) @@ -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) @@ -233,16 +232,16 @@ main (void) 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" + sources = "http://mirror.onelab.eu/third-party/nepi-tip.tgz;" \ + "http://mirror.onelab.eu/third-party/nepi-connect.png" - app = ec.register_resource("LinuxApplication") + app = ec.register_resource("linux::Application") ec.set(app, "sources", sources) command = "ls ${SRC}" @@ -250,6 +249,7 @@ main (void) ec.register_connection(app, node) + ec.deploy() ec.wait_finished([app]) @@ -261,12 +261,12 @@ main (void) self.assertTrue(exitcode.strip() == "0") out = ec.trace(app, "deploy_stdout") - self.assertTrue(out.find("tip.tar.gz") > -1) - self.assertTrue(out.find("connect.png") > -1) + self.assertTrue(out.find("nepi-tip.tgz") > -1) + self.assertTrue(out.find("nepi-connect.png") > -1) stdout = ec.trace(app, "stdout") - self.assertTrue(stdout.find("tip.tar.gz") > -1) - self.assertTrue(stdout.find("connect.png") > -1) + self.assertTrue(stdout.find("nepi-tip.tgz") > -1) + self.assertTrue(stdout.find("nepi-connect.png") > -1) ec.shutdown() @@ -275,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) @@ -309,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)