Added Linux Application
[nepi.git] / test / resources / linux / node.py
old mode 100755 (executable)
new mode 100644 (file)
index c3563e3..075c353
@@ -2,78 +2,59 @@
 from neco.resources.linux.node import LinuxNode
 from neco.util.sshfuncs import RUNNING, FINISHED
 
-import os.path
+from test_utils import skipIfNotAlive, skipInteractive, create_node
+
+import os
 import time
 import tempfile
 import unittest
 
-
-class DummyEC(object):
-    pass
-
 class LinuxNodeTestCase(unittest.TestCase):
     def setUp(self):
-        host = 'nepi2.pl.sophia.inria.fr'
-        user = 'inria_nepi'
-        self.node_fedora = self.create_node(host, user)
+        self.fedora_host = 'nepi2.pl.sophia.inria.fr'
+        self.fedora_user = 'inria_nepi'
 
-        host = 'roseval.pl.sophia.inria.fr'
-        user = 'alina'
-        self.node_ubuntu = self.create_node(host, user)
+        self.ubuntu_host = 'roseval.pl.sophia.inria.fr'
+        self.ubuntu_user = 'alina'
         
         self.target = 'nepi5.pl.sophia.inria.fr'
-        self.home = '${HOME}/test-app'
-
-    def create_node(self, host, user):
-        ec = DummyEC()
-
-        node = LinuxNode(ec, 1)
-        node.host = host
-        node.user = user
-
-        return node
 
-    def t_xterm(self, node):
-        if not node.is_alive():
-            print "*** WARNING: Skipping test: Node %s is not alive\n" % (node.host)
-            return 
+    @skipIfNotAlive
+    def t_xterm(self, host, user):
+        node, ec = create_node(host, user)
 
-        node.enable_x11 = True
+        node.install_packages('xterm')
 
-        node.install('xterm')
-
-        out = node.execute('xterm')
-
-        node.uninstall('xterm')
+        (out, err), proc = node.execute('xterm', forward_x11 = True)
+        
+        self.assertEquals(out, "")
 
+        (out, err), proc = node.remove_packages('xterm')
+        
         self.assertEquals(out, "")
 
-    def t_execute(self, node, target):
-        if not node.is_alive():
-            print "*** WARNING: Skipping test: Node %s is not alive\n" % (node.host)
-            return 
+    @skipIfNotAlive
+    def t_execute(self, host, user):
+        node, ec = create_node(host, user)
 
-        command = "ping -qc3 %s" % target
-        out = node.execute(command)
+        command = "ping -qc3 %s" % self.target
+        
+        (out, err), proc = node.execute(command)
 
         expected = """3 packets transmitted, 3 received, 0% packet loss"""
 
         self.assertTrue(out.find(expected) > 0)
 
-    def t_run(self, node, target):
-        if not node.is_alive():
-            print "*** WARNING: Skipping test: Node %s is not alive\n" % (node.host)
-            return
-
-        node.mkdir(self.home, clean = True)
+    @skipIfNotAlive
+    def t_run(self, host, user):
+        node, ec = create_node(host, user)
         
-        command = "ping %s" % target
-        dst = os.path.join(self.home, "app.sh")
-        node.upload(command, dst)
+        app_home = os.path.join(node.exp_dir, "my-app")
+        node.mkdir(app_home, clean = True)
         
-        cmd = "bash ./app.sh"
-        node.run(cmd, self.home)
-        pid, ppid = node.checkpid(self.home)
+        command = "ping %s" % self.target
+        node.run(command, app_home)
+        pid, ppid = node.checkpid(app_home)
 
         status = node.status(pid, ppid)
         self.assertTrue(status, RUNNING)
@@ -81,15 +62,21 @@ class LinuxNodeTestCase(unittest.TestCase):
         node.kill(pid, ppid)
         status = node.status(pid, ppid)
         self.assertTrue(status, FINISHED)
+        
+        (out, err), proc = node.check_output(app_home, "stdout")
+
+        expected = """64 bytes from"""
 
-        node.rmdir(self.home)
+        self.assertTrue(out.find(expected) > 0)
+
+        node.rmdir(app_home)
 
-    def t_install(self, node):
-        if not node.is_alive():
-            print "*** WARNING: Skipping test: Node %s is not alive\n" % (node.host)
-            return
+    @skipIfNotAlive
+    def t_install(self, host, user):
+        node, ec = create_node(host, user)
 
-        node.mkdir(self.home, clean = True)
+        app_home = os.path.join(node.exp_dir, "my-app")
+        node.mkdir(app_home, clean = True)
 
         prog = """#include <stdio.h>
 
@@ -101,35 +88,36 @@ main (void)
 }
 """
         # upload the test program
-        dst = os.path.join(self.home, "hello.c")
-        node.upload(prog, dst)
+        dst = os.path.join(app_home, "hello.c")
+        node.upload(prog, dst, text = True)
 
         # install gcc
-        node.install('gcc')
+        node.install_packages('gcc')
 
         # compile the program using gcc
-        command = "cd %s; gcc -Wall hello.c -o hello" % self.home
-        out = node.execute(command)
+        command = "cd %s; gcc -Wall hello.c -o hello" % app_home
+        (out, err), proc = node.execute(command)
 
-        # execute the program and get the output from stout
-        command = "%s/hello" % self.home
-        out = node.execute(command)
+        # execute the program and get the output from stdout
+        command = "%s/hello" % app_home 
+        (out, err), proc = node.execute(command)
+
+        self.assertEquals(out, "Hello, world!\n")
 
         # execute the program and get the output from a file
-        command = "%s/hello > %s/hello.out" % (self.home, self.home)
-        node.execute(command)
+        command = "%(home)s/hello > %(home)s/hello.out" % {
+                'home': app_home}
+        (out, err), proc = node.execute(command)
 
         # retrieve the output file 
-        src = os.path.join(self.home, "hello.out")
+        src = os.path.join(app_home, "hello.out")
         f = tempfile.NamedTemporaryFile(delete=False)
         dst = f.name
         node.download(src, dst)
         f.close()
 
-        node.uninstall('gcc')
-        node.rmdir(self.home)
-
-        self.assertEquals(out, "Hello, world!\n")
+        node.remove_packages('gcc')
+        node.rmdir(app_home)
 
         f = open(dst, "r")
         out = f.read()
@@ -138,31 +126,27 @@ main (void)
         self.assertEquals(out, "Hello, world!\n")
 
     def test_execute_fedora(self):
-        self.t_execute(self.node_fedora, self.target)
+        self.t_execute(self.fedora_host, self.fedora_user)
 
     def test_execute_ubuntu(self):
-        self.t_execute(self.node_ubuntu, self.target)
+        self.t_execute(self.ubuntu_host, self.ubuntu_user)
 
     def test_run_fedora(self):
-        self.t_run(self.node_fedora, self.target)
+        self.t_run(self.fedora_host, self.fedora_user)
 
     def test_run_ubuntu(self):
-        self.t_run(self.node_ubuntu, self.target)
+        self.t_run(self.ubuntu_host, self.ubuntu_user)
 
     def test_intall_fedora(self):
-        self.t_install(self.node_fedora)
+        self.t_install(self.fedora_host, self.fedora_user)
 
     def test_install_ubuntu(self):
-        self.t_install(self.node_ubuntu)
-
-    def xtest_xterm_fedora(self):
-        """ PlanetLab doesn't currently support X11 forwarding.
-        Interactive test. Should not run automatically """
-        self.t_xterm(self.node_fedora)
-
-    def xtest_xterm_ubuntu(self):
+        self.t_install(self.ubuntu_host, self.ubuntu_user)
+    
+    @skipInteractive
+    def test_xterm_ubuntu(self):
         """ Interactive test. Should not run automatically """
-        self.t_xterm(self.node_ubuntu)
+        self.t_xterm(self.ubuntu_host, self.ubuntu_user)
 
 
 if __name__ == '__main__':