X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fapplication.py;h=cdd6fe7f8aa43d829f427aee854c8ae9ca355693;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=934081c1f60ff5afe5aea50655a246f8bec432f4;hpb=752d0aaffb889011159fef73c02d838e538d7144;p=nepi.git diff --git a/test/resources/linux/application.py b/test/resources/linux/application.py index 934081c1..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 @@ -25,6 +24,7 @@ from nepi.execution.trace import TraceAttr from test_utils import skipIfNotAlive, skipInteractive import os +import shutil import time import tempfile import unittest @@ -35,7 +35,7 @@ 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" @@ -44,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) @@ -60,7 +60,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") @@ -72,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) @@ -89,19 +89,19 @@ 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) - 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() @@ -110,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 @@ -128,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") @@ -140,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() @@ -149,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) @@ -169,22 +169,22 @@ 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]) ) 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() @@ -193,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) @@ -219,8 +219,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") @@ -232,26 +232,30 @@ 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://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}" + ec.set(app, "command", command) + ec.register_connection(app, node) + ec.deploy() 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") @@ -260,6 +264,10 @@ 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 @@ -267,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) @@ -284,10 +292,48 @@ 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("linux::Node") + ec.set(node, "hostname", host) + ec.set(node, "username", user) + ec.set(node, "cleanExperiment", True) + ec.set(node, "cleanProcesses", True) + + 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) + + 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) @@ -329,6 +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()