X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fapplication.py;h=11d5758a5c8bf2128e04bda1d904d37b1494212c;hb=9bc3d34df11fdaf2138df236ff7ea842cda06215;hp=5fe15d90a59a44f5e2304d7e187b8193686efcd6;hpb=245dc3d34b17d5ccbdb4e438c998bd547a7af076;p=nepi.git

diff --git a/test/resources/linux/application.py b/test/resources/linux/application.py
index 5fe15d90..11d5758a 100755
--- a/test/resources/linux/application.py
+++ b/test/resources/linux/application.py
@@ -35,7 +35,6 @@ import unittest
 class LinuxApplicationTestCase(unittest.TestCase):
     def setUp(self):
         self.fedora_host = "nepi2.pl.sophia.inria.fr"
-        self.fedora_host = "planetlab2.u-strasbg.fr"
         self.fedora_user = "inria_nepi"
 
         self.ubuntu_host = "roseval.pl.sophia.inria.fr"
@@ -50,7 +49,7 @@ class LinuxApplicationTestCase(unittest.TestCase):
         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)
@@ -65,7 +64,7 @@ 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)
@@ -82,7 +81,7 @@ class LinuxApplicationTestCase(unittest.TestCase):
         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)
@@ -98,7 +97,7 @@ 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)
@@ -112,11 +111,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_code(self, host, user):
+        from nepi.execution.resource import ResourceFactory
+        
+        ResourceFactory.register_type(LinuxNode)
+        ResourceFactory.register_type(LinuxApplication)
+
+        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)
+        
+        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):
         from nepi.execution.resource import ResourceFactory
@@ -124,7 +166,7 @@ class LinuxApplicationTestCase(unittest.TestCase):
         ResourceFactory.register_type(LinuxNode)
         ResourceFactory.register_type(LinuxApplication)
 
-        ec = ExperimentController()
+        ec = ExperimentController(exp_id="test-concurrency")
         
         node = ec.register_resource("LinuxNode")
         ec.set(node, "hostname", host)
@@ -160,7 +202,7 @@ 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()
@@ -172,7 +214,7 @@ class LinuxApplicationTestCase(unittest.TestCase):
         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)
@@ -215,7 +257,7 @@ class LinuxApplicationTestCase(unittest.TestCase):
         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)
@@ -238,10 +280,10 @@ class LinuxApplicationTestCase(unittest.TestCase):
         self.assertTrue(ec.state(node) == ResourceState.STARTED)
         self.assertTrue(ec.state(app) == ResourceState.FINISHED)
 
-        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)
 
@@ -254,7 +296,7 @@ class LinuxApplicationTestCase(unittest.TestCase):
         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)
@@ -307,6 +349,12 @@ 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 """