git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tests'
[nepi.git]
/
test
/
resources
/
linux
/
application.py
diff --git
a/test/resources/linux/application.py
b/test/resources/linux/application.py
index
4bda4f9
..
ab70b23
100755
(executable)
--- a/
test/resources/linux/application.py
+++ b/
test/resources/linux/application.py
@@
-31,13
+31,13
@@
import unittest
class LinuxApplicationTestCase(unittest.TestCase):
def setUp(self):
class LinuxApplicationTestCase(unittest.TestCase):
def setUp(self):
- self.fedora_host = "
nepi2
.pl.sophia.inria.fr"
+ self.fedora_host = "
fedora
.pl.sophia.inria.fr"
self.fedora_user = "inria_nepi"
self.fedora_user = "inria_nepi"
- self.ubuntu_host = "
roseval
.pl.sophia.inria.fr"
+ self.ubuntu_host = "
ubuntu
.pl.sophia.inria.fr"
self.ubuntu_user = "inria_nepi"
self.ubuntu_user = "inria_nepi"
- self.target = "nepi
5
.pl.sophia.inria.fr"
+ self.target = "nepi.pl.sophia.inria.fr"
@skipIfNotAlive
def t_stdout(self, host, user):
@skipIfNotAlive
def t_stdout(self, host, user):
@@
-93,15
+93,15
@@
class LinuxApplicationTestCase(unittest.TestCase):
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.assertEqual
s
(len(stdout), size)
+ self.assertEqual(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.assertEqual
s
(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")
path = ec.trace(app, "stdout", attr = TraceAttr.PATH)
rm = ec.get_resource(app)
p = os.path.join(rm.run_home, "stdout")
- self.assertEqual
s
(path, p)
+ self.assertEqual(path, p)
ec.shutdown()
ec.shutdown()
@@
-140,7
+140,7
@@
main (void)
ec.wait_finished(app)
out = ec.trace(app, 'stdout')
ec.wait_finished(app)
out = ec.trace(app, 'stdout')
- self.assertEqual
s
(out, "Hello, world!\n")
+ self.assertEqual(out, "Hello, world!\n")
ec.shutdown()
ec.shutdown()
@@
-156,7
+156,7
@@
main (void)
ec.set(node, "cleanProcesses", True)
apps = list()
ec.set(node, "cleanProcesses", True)
apps = list()
- for i in
x
range(50):
+ for i in range(50):
app = ec.register_resource("linux::Application")
cmd = "ping -c5 %s" % self.target
ec.set(app, "command", cmd)
app = ec.register_resource("linux::Application")
cmd = "ping -c5 %s" % self.target
ec.set(app, "command", cmd)
@@
-176,15
+176,15
@@
main (void)
for app in apps:
stdout = ec.trace(app, 'stdout')
size = ec.trace(app, 'stdout', attr = TraceAttr.SIZE)
for app in apps:
stdout = ec.trace(app, 'stdout')
size = ec.trace(app, 'stdout', attr = TraceAttr.SIZE)
- self.assertEqual
s
(len(stdout), size)
+ self.assertEqual(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.assertEqual
s
(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')
path = ec.trace(app, 'stdout', attr = TraceAttr.PATH)
rm = ec.get_resource(app)
p = os.path.join(rm.run_home, 'stdout')
- self.assertEqual
s
(path, p)
+ self.assertEqual(path, p)
ec.shutdown()
ec.shutdown()
@@
-238,8
+238,8
@@
main (void)
ec.set(node, "cleanExperiment", True)
ec.set(node, "cleanProcesses", 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://
mirror.onelab.eu/third-party/nepi-tip.t
gz;" \
+ "http://
mirror.onelab.eu/third-party/nepi-
connect.png"
app = ec.register_resource("linux::Application")
ec.set(app, "sources", sources)
app = ec.register_resource("linux::Application")
ec.set(app, "sources", sources)
@@
-261,12
+261,12
@@
main (void)
self.assertTrue(exitcode.strip() == "0")
out = ec.trace(app, "deploy_stdout")
self.assertTrue(exitcode.strip() == "0")
out = ec.trace(app, "deploy_stdout")
- self.assertTrue(out.find("
tip.tar.
gz") > -1)
- self.assertTrue(out.find("connect.png") > -1)
+ self.assertTrue(out.find("
nepi-tip.t
gz") > -1)
+ self.assertTrue(out.find("
nepi-
connect.png") > -1)
stdout = ec.trace(app, "stdout")
stdout = ec.trace(app, "stdout")
- self.assertTrue(stdout.find("
tip.tar.
gz") > -1)
- self.assertTrue(stdout.find("connect.png") > -1)
+ self.assertTrue(stdout.find("
nepi-tip.t
gz") > -1)
+ self.assertTrue(stdout.find("
nepi-
connect.png") > -1)
ec.shutdown()
ec.shutdown()