git://git.onelab.eu / nepi.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update some tests that were failing
[nepi.git] / test / resources / linux / application.py
diff --git a/test/resources/linux/application.py b/test/resources/linux/application.py
index b1e489c..8d8fe21 100755 (executable)
--- a/test/resources/linux/application.py
+++ b/test/resources/linux/application.py
@@ -18,12 +18,9 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
-
 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
 
@@ -44,12 +41,8 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
     @skipIfNotAlive
     def t_stdout(self, host, user):
-        from nepi.execution.resource import ResourceFactory
-        
-        ResourceFactory.register_type(LinuxNode)
-        ResourceFactory.register_type(LinuxApplication)
 
-        ec = ExperimentController()
+        ec = ExperimentController(exp_id = "test-stdout")
         
         node = ec.register_resource("LinuxNode")
         ec.set(node, "hostname", host)
@@ -64,10 +57,10 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
         ec.deploy()
 
-        ec.wait_finished([app])
+        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,12 +69,8 @@ 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()
+        ec = ExperimentController(exp_id = "test-ping")
         
         node = ec.register_resource("LinuxNode")
         ec.set(node, "hostname", host)
@@ -97,10 +86,10 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
         ec.deploy()
 
-        ec.wait_finished([app])
+        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)
@@ -111,19 +100,54 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
         path = ec.trace(app, "stdout", attr = TraceAttr.PATH)
         rm = ec.get_resource(app)
-        p = os.path.join(rm.app_home, "stdout")
+        p = os.path.join(rm.run_home, "stdout")
         self.assertEquals(path, p)
 
         ec.shutdown()
 
     @skipIfNotAlive
-    def t_concurrency(self, host, user):
-        from nepi.execution.resource import ResourceFactory
+    def t_code(self, host, user):
+
+        ec = ExperimentController(exp_id = "tests-code")
+        
+        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)
         
-        ResourceFactory.register_type(LinuxNode)
-        ResourceFactory.register_type(LinuxApplication)
+        prog = """#include <stdio.h>
+
+int
+main (void)
+{
+    printf ("Hello, world!\\n");
+    return 0;
+}
+"""
+        cmd = "${RUN_HOME}/hello" 
+        build = "gcc -Wall -x c ${APP_HOME}/code -o hello" 
+
+        app = ec.register_resource("LinuxApplication")
+        ec.set(app, "command", cmd)
+        ec.set(app, "code", prog)
+        ec.set(app, "depends", "gcc")
+        ec.set(app, "build", build)
+        ec.register_connection(app, node)
+
+        ec.deploy()
+
+        ec.wait_finished(app)
+
+        out = ec.trace(app, 'stdout')
+        self.assertEquals(out, "Hello, world!\n")
+
+        ec.shutdown()
+
+    @skipIfNotAlive
+    def t_concurrency(self, host, user):
 
-        ec = ExperimentController()
+        ec = ExperimentController(exp_id="test-concurrency")
         
         node = ec.register_resource("LinuxNode")
         ec.set(node, "hostname", host)
@@ -145,7 +169,7 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
         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])
                 )
 
@@ -159,19 +183,15 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
             path = ec.trace(app, 'stdout', attr = TraceAttr.PATH)
             rm = ec.get_resource(app)
-            p = os.path.join(rm.app_home, 'stdout')
+            p = os.path.join(rm.run_home, 'stdout')
             self.assertEquals(path, p)
 
         ec.shutdown()
 
     @skipIfNotAlive
     def t_condition(self, host, user, depends):
-        from nepi.execution.resource import ResourceFactory
-        
-        ResourceFactory.register_type(LinuxNode)
-        ResourceFactory.register_type(LinuxApplication)
 
-        ec = ExperimentController()
+        ec = ExperimentController(exp_id="test-condition")
         
         node = ec.register_resource("LinuxNode")
         ec.set(node, "hostname", host)
@@ -199,8 +219,8 @@ class LinuxApplicationTestCase(unittest.TestCase):
         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")
@@ -209,12 +229,8 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
     @skipIfNotAlive
     def t_http_sources(self, host, user):
-        from nepi.execution.resource import ResourceFactory
-        
-        ResourceFactory.register_type(LinuxNode)
-        ResourceFactory.register_type(LinuxApplication)
 
-        ec = ExperimentController()
+        ec = ExperimentController(exp_id="test-http-sources")
         
         node = ec.register_resource("LinuxNode")
         ec.set(node, "hostname", host)
@@ -222,8 +238,8 @@ class LinuxApplicationTestCase(unittest.TestCase):
         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)
@@ -235,12 +251,12 @@ 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)
 
-        exitcode = ec.trace(app, "http_sources_exitcode")
+        exitcode = ec.trace(app, "deploy_exitcode")
         self.assertTrue(exitcode.strip() == "0")
         
-        out = ec.trace(app, "http_sources_stdout")
+        out = ec.trace(app, "deploy_stdout")
         self.assertTrue(out.find("tip.tar.gz") > -1)
         self.assertTrue(out.find("connect.png") > -1)
 
@@ -248,12 +264,8 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
     @skipIfNotAlive
     def t_xterm(self, host, user):
-        from nepi.execution.resource import ResourceFactory
-        
-        ResourceFactory.register_type(LinuxNode)
-        ResourceFactory.register_type(LinuxApplication)
 
-        ec = ExperimentController()
+        ec = ExperimentController(exp_id="test-xterm")
         
         node = ec.register_resource("LinuxNode")
         ec.set(node, "hostname", host)
@@ -272,7 +284,7 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
         ec.wait_finished([app])
 
-        self.assertTrue(ec.state(app) == ResourceState.FINISHED)
+        self.assertTrue(ec.state(app) == ResourceState.STOPPED)
 
         ec.shutdown()
 
@@ -306,13 +318,18 @@ class LinuxApplicationTestCase(unittest.TestCase):
     def test_http_sources_ubuntu(self):
         self.t_http_sources(self.ubuntu_host, self.ubuntu_user)
 
+    def test_code_fedora(self):
+        self.t_code(self.fedora_host, self.fedora_user)
+
+    def test_code_ubuntu(self):
+        self.t_code(self.ubuntu_host, self.ubuntu_user)
+
     @skipInteractive
     def test_xterm_ubuntu(self):
         """ Interactive test. Should not run automatically """
         self.t_xterm(self.ubuntu_host, self.ubuntu_user)
 
 
-
 if __name__ == '__main__':
     unittest.main()
 
nepi