X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fapplication.py;h=a1f1397b1a18a75747133e02703b1b9fe3e1fdaf;hb=8735dfa68d3621532cc48569d38b6afd6229bcaa;hp=11d5758a5c8bf2128e04bda1d904d37b1494212c;hpb=9bc3d34df11fdaf2138df236ff7ea842cda06215;p=nepi.git diff --git a/test/resources/linux/application.py b/test/resources/linux/application.py index 11d5758a..a1f1397b 100755 --- a/test/resources/linux/application.py +++ b/test/resources/linux/application.py @@ -18,16 +18,14 @@ # # Author: Alina Quereilhac - from nepi.execution.ec import ExperimentController from nepi.execution.resource import ResourceState, ResourceAction from nepi.execution.trace import TraceAttr -from nepi.resources.linux.node import LinuxNode -from nepi.resources.linux.application import LinuxApplication from test_utils import skipIfNotAlive, skipInteractive import os +import shutil import time import tempfile import unittest @@ -38,16 +36,12 @@ class LinuxApplicationTestCase(unittest.TestCase): self.fedora_user = "inria_nepi" self.ubuntu_host = "roseval.pl.sophia.inria.fr" - self.ubuntu_user = "alina" + self.ubuntu_user = "inria_nepi" self.target = "nepi5.pl.sophia.inria.fr" @skipIfNotAlive def t_stdout(self, host, user): - from nepi.execution.resource import ResourceFactory - - ResourceFactory.register_type(LinuxNode) - ResourceFactory.register_type(LinuxApplication) ec = ExperimentController(exp_id = "test-stdout") @@ -67,7 +61,7 @@ class LinuxApplicationTestCase(unittest.TestCase): ec.wait_finished(app) self.assertTrue(ec.state(node) == ResourceState.STARTED) - self.assertTrue(ec.state(app) == ResourceState.FINISHED) + self.assertTrue(ec.state(app) == ResourceState.STOPPED) stdout = ec.trace(app, "stdout") self.assertTrue(stdout.strip() == "HOLA") @@ -76,10 +70,6 @@ class LinuxApplicationTestCase(unittest.TestCase): @skipIfNotAlive def t_ping(self, host, user): - from nepi.execution.resource import ResourceFactory - - ResourceFactory.register_type(LinuxNode) - ResourceFactory.register_type(LinuxApplication) ec = ExperimentController(exp_id = "test-ping") @@ -100,7 +90,7 @@ class LinuxApplicationTestCase(unittest.TestCase): ec.wait_finished(app) self.assertTrue(ec.state(node) == ResourceState.STARTED) - self.assertTrue(ec.state(app) == ResourceState.FINISHED) + self.assertTrue(ec.state(app) == ResourceState.STOPPED) stdout = ec.trace(app, "stdout") size = ec.trace(app, "stdout", attr = TraceAttr.SIZE) @@ -118,10 +108,6 @@ class LinuxApplicationTestCase(unittest.TestCase): @skipIfNotAlive def t_code(self, host, user): - from nepi.execution.resource import ResourceFactory - - ResourceFactory.register_type(LinuxNode) - ResourceFactory.register_type(LinuxApplication) ec = ExperimentController(exp_id = "tests-code") @@ -161,10 +147,6 @@ main (void) @skipIfNotAlive def t_concurrency(self, host, user): - from nepi.execution.resource import ResourceFactory - - ResourceFactory.register_type(LinuxNode) - ResourceFactory.register_type(LinuxApplication) ec = ExperimentController(exp_id="test-concurrency") @@ -188,7 +170,7 @@ main (void) self.assertTrue(ec.state(node) == ResourceState.STARTED) self.assertTrue( - all([ec.state(guid) == ResourceState.FINISHED \ + all([ec.state(guid) == ResourceState.STOPPED \ for guid in apps]) ) @@ -209,10 +191,6 @@ main (void) @skipIfNotAlive def t_condition(self, host, user, depends): - from nepi.execution.resource import ResourceFactory - - ResourceFactory.register_type(LinuxNode) - ResourceFactory.register_type(LinuxApplication) ec = ExperimentController(exp_id="test-condition") @@ -242,8 +220,8 @@ main (void) ec.wait_finished(apps) self.assertTrue(ec.state(node) == ResourceState.STARTED) - self.assertTrue(ec.state(server) == ResourceState.FINISHED) - self.assertTrue(ec.state(client) == ResourceState.FINISHED) + self.assertTrue(ec.state(server) == ResourceState.STOPPED) + self.assertTrue(ec.state(client) == ResourceState.STOPPED) stdout = ec.trace(client, "stdout") self.assertTrue(stdout.strip() == "HOLA") @@ -252,10 +230,6 @@ main (void) @skipIfNotAlive def t_http_sources(self, host, user): - from nepi.execution.resource import ResourceFactory - - ResourceFactory.register_type(LinuxNode) - ResourceFactory.register_type(LinuxApplication) ec = ExperimentController(exp_id="test-http-sources") @@ -265,12 +239,15 @@ main (void) ec.set(node, "cleanHome", True) ec.set(node, "cleanProcesses", True) - sources = "http://nepi.inria.fr/code/nef/archive/tip.tar.gz " \ - " http://nepi.inria.fr/code/nef/raw-file/8ace577d4079/src/nef/images/menu/connect.png" + 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") ec.set(app, "sources", sources) + command = "ls ${SRC}" + ec.set(app, "command", command) + ec.register_connection(app, node) ec.deploy() @@ -278,7 +255,7 @@ main (void) ec.wait_finished([app]) self.assertTrue(ec.state(node) == ResourceState.STARTED) - self.assertTrue(ec.state(app) == ResourceState.FINISHED) + self.assertTrue(ec.state(app) == ResourceState.STOPPED) exitcode = ec.trace(app, "deploy_exitcode") self.assertTrue(exitcode.strip() == "0") @@ -287,14 +264,14 @@ main (void) self.assertTrue(out.find("tip.tar.gz") > -1) self.assertTrue(out.find("connect.png") > -1) + stdout = ec.trace(app, "stdout") + self.assertTrue(stdout.find("tip.tar.gz") > -1) + self.assertTrue(stdout.find("connect.png") > -1) + ec.shutdown() @skipIfNotAlive def t_xterm(self, host, user): - from nepi.execution.resource import ResourceFactory - - ResourceFactory.register_type(LinuxNode) - ResourceFactory.register_type(LinuxApplication) ec = ExperimentController(exp_id="test-xterm") @@ -315,9 +292,47 @@ main (void) ec.wait_finished([app]) - self.assertTrue(ec.state(app) == ResourceState.FINISHED) + self.assertTrue(ec.state(app) == ResourceState.STOPPED) + + ec.shutdown() + + @skipIfNotAlive + def t_copy_files(self, host, user): + # create some temp files and directories to copy + dirpath = tempfile.mkdtemp() + f = tempfile.NamedTemporaryFile(dir=dirpath, delete=False) + f.close() + + f1 = tempfile.NamedTemporaryFile(delete=False) + f1.close() + f1.name + + ec = ExperimentController(exp_id="test-copyfile") + + 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) + + app = ec.register_resource("LinuxApplication") + ec.set(app, "command", "ls ${SRC}") + ec.set(app, "sources", "%s;%s" % (dirpath, f1.name)) + ec.register_connection(app, node) + + ec.deploy() + + ec.wait_finished([app]) + + stdout = ec.trace(app, "stdout") + + self.assertTrue(stdout.find(os.path.basename(dirpath)) > -1) + self.assertTrue(stdout.find(os.path.basename(f1.name)) > -1) ec.shutdown() + + os.remove(f1.name) + shutil.rmtree(dirpath) def test_stdout_fedora(self): self.t_stdout(self.fedora_host, self.fedora_user) @@ -360,7 +375,11 @@ main (void) """ Interactive test. Should not run automatically """ self.t_xterm(self.ubuntu_host, self.ubuntu_user) + def test_copy_files_fedora(self): + self.t_copy_files(self.fedora_host, self.fedora_user) + def test_copy_files_ubuntu(self): + self.t_copy_files(self.ubuntu_host, self.ubuntu_user) if __name__ == '__main__': unittest.main()