X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fapplication.py;h=11d5758a5c8bf2128e04bda1d904d37b1494212c;hb=9bc3d34df11fdaf2138df236ff7ea842cda06215;hp=336ce2357c4e5287facbb8c5b3ff38a3ddc253d7;hpb=4896d77f40a611a22f9f1f8f2ae0e63e9008fee1;p=nepi.git
diff --git a/test/resources/linux/application.py b/test/resources/linux/application.py
old mode 100644
new mode 100755
index 336ce235..11d5758a
--- a/test/resources/linux/application.py
+++ b/test/resources/linux/application.py
@@ -1,30 +1,31 @@
-"""
- NEPI, a framework to manage network experiments
- 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.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+#!/usr/bin/env python
+#
+# NEPI, a framework to manage network experiments
+# 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.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+# Author: Alina Quereilhac
-"""
-#!/usr/bin/env python
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
+from test_utils import skipIfNotAlive, skipInteractive
import os
import time
@@ -33,13 +34,13 @@ import unittest
class LinuxApplicationTestCase(unittest.TestCase):
def setUp(self):
- self.fedora_host = 'nepi2.pl.sophia.inria.fr'
- self.fedora_user = 'inria_nepi'
+ self.fedora_host = "nepi2.pl.sophia.inria.fr"
+ self.fedora_user = "inria_nepi"
- self.ubuntu_host = 'roseval.pl.sophia.inria.fr'
- self.ubuntu_user = 'alina'
+ self.ubuntu_host = "roseval.pl.sophia.inria.fr"
+ self.ubuntu_user = "alina"
- self.target = 'nepi5.pl.sophia.inria.fr'
+ self.target = "nepi5.pl.sophia.inria.fr"
@skipIfNotAlive
def t_stdout(self, host, user):
@@ -48,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)
@@ -63,12 +64,12 @@ 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)
- stdout = ec.trace(app, 'stdout')
+ stdout = ec.trace(app, "stdout")
self.assertTrue(stdout.strip() == "HOLA")
ec.shutdown()
@@ -80,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)
@@ -96,25 +97,68 @@ 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)
- stdout = ec.trace(app, 'stdout')
- size = ec.trace(app, 'stdout', attr = TraceAttr.SIZE)
+ stdout = ec.trace(app, "stdout")
+ size = ec.trace(app, "stdout", attr = TraceAttr.SIZE)
self.assertEquals(len(stdout), size)
- block = ec.trace(app, 'stdout', attr = TraceAttr.STREAM, block = 5, offset = 1)
+ block = ec.trace(app, "stdout", attr = TraceAttr.STREAM, block = 5, offset = 1)
self.assertEquals(block, stdout[5:10])
- path = ec.trace(app, 'stdout', attr = TraceAttr.PATH)
+ 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
+
+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
@@ -122,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)
@@ -158,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()
@@ -170,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)
@@ -201,7 +245,7 @@ class LinuxApplicationTestCase(unittest.TestCase):
self.assertTrue(ec.state(server) == ResourceState.FINISHED)
self.assertTrue(ec.state(client) == ResourceState.FINISHED)
- stdout = ec.trace(client, 'stdout')
+ stdout = ec.trace(client, "stdout")
self.assertTrue(stdout.strip() == "HOLA")
ec.shutdown()
@@ -213,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)
@@ -221,8 +265,8 @@ class LinuxApplicationTestCase(unittest.TestCase):
ec.set(node, "cleanHome", True)
ec.set(node, "cleanProcesses", True)
- sources = "http://nepi.inria.fr/attachment/wiki/WikiStart/pybindgen-r794.tar.gz " \
- "http://nepi.inria.fr/attachment/wiki/WikiStart/nepi_integration_framework.pdf"
+ 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"
app = ec.register_resource("LinuxApplication")
ec.set(app, "sources", sources)
@@ -236,12 +280,42 @@ class LinuxApplicationTestCase(unittest.TestCase):
self.assertTrue(ec.state(node) == ResourceState.STARTED)
self.assertTrue(ec.state(app) == ResourceState.FINISHED)
- err = ec.trace(app, 'http_sources_err')
- self.assertTrue(err == "")
+ exitcode = ec.trace(app, "deploy_exitcode")
+ self.assertTrue(exitcode.strip() == "0")
- out = ec.trace(app, 'http_sources_out')
- self.assertTrue(out.find("pybindgen-r794.tar.gz") > -1)
- self.assertTrue(out.find("nepi_integration_framework.pdf") > -1)
+ out = ec.trace(app, "deploy_stdout")
+ self.assertTrue(out.find("tip.tar.gz") > -1)
+ self.assertTrue(out.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")
+
+ 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", "xterm")
+ ec.set(app, "depends", "xterm")
+ ec.set(app, "forwardX11", True)
+
+ ec.register_connection(app, node)
+
+ ec.deploy()
+
+ ec.wait_finished([app])
+
+ self.assertTrue(ec.state(app) == ResourceState.FINISHED)
ec.shutdown()
@@ -275,8 +349,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)
+
- # TODO: test compilation, sources, dependencies, etc!!!
if __name__ == '__main__':
unittest.main()