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
replacing assertEquals into assertEqual
[nepi.git]
/
test
/
resources
/
linux
/
node.py
diff --git
a/test/resources/linux/node.py
b/test/resources/linux/node.py
index
10f306a
..
c9fb8ae
100755
(executable)
--- a/
test/resources/linux/node.py
+++ b/
test/resources/linux/node.py
@@
-98,7
+98,7
@@
class LinuxNodeTestCase(unittest.TestCase):
# get the pid of the process
ecode = node.exitcode(app_home)
# get the pid of the process
ecode = node.exitcode(app_home)
- self.assertEqual
s
(ecode, ExitCode.OK)
+ self.assertEqual(ecode, ExitCode.OK)
@skipIfNotAlive
def t_exitcode_kill(self, host, user):
@skipIfNotAlive
def t_exitcode_kill(self, host, user):
@@
-125,17
+125,17
@@
class LinuxNodeTestCase(unittest.TestCase):
# The process is still running, so no retfile has been created yet
ecode = node.exitcode(app_home)
# The process is still running, so no retfile has been created yet
ecode = node.exitcode(app_home)
- self.assertEqual
s
(ecode, ExitCode.FILENOTFOUND)
+ self.assertEqual(ecode, ExitCode.FILENOTFOUND)
(out, err), proc = node.check_errors(app_home)
(out, err), proc = node.check_errors(app_home)
- self.assertEqual
s
(err, "")
+ self.assertEqual(err, "")
# Now kill the app
pid, ppid = node.getpid(app_home)
node.kill(pid, ppid)
(out, err), proc = node.check_errors(app_home)
# Now kill the app
pid, ppid = node.getpid(app_home)
node.kill(pid, ppid)
(out, err), proc = node.check_errors(app_home)
- self.assertEqual
s
(err, "")
+ self.assertEqual(err, "")
@skipIfNotAlive
def t_exitcode_error(self, host, user):
@skipIfNotAlive
def t_exitcode_error(self, host, user):
@@
-160,7
+160,7
@@
class LinuxNodeTestCase(unittest.TestCase):
ecode = node.exitcode(app_home)
# bash erro 127 - command not found
ecode = node.exitcode(app_home)
# bash erro 127 - command not found
- self.assertEqual
s
(ecode, 127)
+ self.assertEqual(ecode, 127)
(out, err), proc = node.check_errors(app_home)
(out, err), proc = node.check_errors(app_home)
@@
-172,16
+172,16
@@
class LinuxNodeTestCase(unittest.TestCase):
node.find_home()
(out, err), proc = node.mkdir(node.node_home, clean = True)
node.find_home()
(out, err), proc = node.mkdir(node.node_home, clean = True)
- self.assertEqual
s
(err, "")
+ self.assertEqual(err, "")
(out, err), proc = node.install_packages("gcc", node.node_home)
(out, err), proc = node.install_packages("gcc", node.node_home)
- self.assertEqual
s
(err, "")
+ self.assertEqual(err, "")
(out, err), proc = node.remove_packages("gcc", node.node_home)
(out, err), proc = node.remove_packages("gcc", node.node_home)
- self.assertEqual
s
(err, "")
+ self.assertEqual(err, "")
(out, err), proc = node.rmdir(node.exp_home)
(out, err), proc = node.rmdir(node.exp_home)
- self.assertEqual
s
(err, "")
+ self.assertEqual(err, "")
@skipIfNotAlive
def t_clean(self, host, user):
@skipIfNotAlive
def t_clean(self, host, user):
@@
-194,24
+194,24
@@
class LinuxNodeTestCase(unittest.TestCase):
command1 = " [ -d %s ] && echo 'Found'" % node.lib_dir
(out, err), proc = node.execute(command1)
command1 = " [ -d %s ] && echo 'Found'" % node.lib_dir
(out, err), proc = node.execute(command1)
- self.assertEqual
s
(out.strip(), "Found")
+ self.assertEqual(out.strip(), "Found")
command2 = " [ -d %s ] && echo 'Found'" % node.node_home
(out, err), proc = node.execute(command2)
command2 = " [ -d %s ] && echo 'Found'" % node.node_home
(out, err), proc = node.execute(command2)
- self.assertEqual
s
(out.strip(), "Found")
+ self.assertEqual(out.strip(), "Found")
node.clean_experiment()
(out, err), proc = node.execute(command2)
node.clean_experiment()
(out, err), proc = node.execute(command2)
- self.assertEqual
s
(out.strip(), "")
+ self.assertEqual(out.strip(), "")
node.clean_home()
(out, err), proc = node.execute(command1)
node.clean_home()
(out, err), proc = node.execute(command1)
- self.assertEqual
s
(out.strip(), "")
+ self.assertEqual(out.strip(), "")
@skipIfNotAlive
def t_xterm(self, host, user):
@skipIfNotAlive
def t_xterm(self, host, user):
@@
-219,16
+219,16
@@
class LinuxNodeTestCase(unittest.TestCase):
node.find_home()
(out, err), proc = node.mkdir(node.node_home, clean = True)
node.find_home()
(out, err), proc = node.mkdir(node.node_home, clean = True)
- self.assertEqual
s
(err, "")
+ self.assertEqual(err, "")
node.install_packages("xterm", node.node_home)
node.install_packages("xterm", node.node_home)
- self.assertEqual
s
(err, "")
+ self.assertEqual(err, "")
(out, err), proc = node.execute("xterm", forward_x11 = True)
(out, err), proc = node.execute("xterm", forward_x11 = True)
- self.assertEqual
s
(err, "")
+ self.assertEqual(err, "")
(out, err), proc = node.remove_packages("xterm", node.node_home)
(out, err), proc = node.remove_packages("xterm", node.node_home)
- self.assertEqual
s
(err, "")
+ self.assertEqual(err, "")
@skipIfNotAlive
def t_compile(self, host, user):
@skipIfNotAlive
def t_compile(self, host, user):
@@
-262,7
+262,7
@@
main (void)
command = "%s/hello" % app_home
(out, err), proc = node.execute(command)
command = "%s/hello" % app_home
(out, err), proc = node.execute(command)
- self.assertEqual
s
(out, "Hello, world!\n")
+ self.assertEqual(out, "Hello, world!\n")
# execute the program and get the output from a file
command = "%(home)s/hello > %(home)s/hello.out" % {
# execute the program and get the output from a file
command = "%(home)s/hello > %(home)s/hello.out" % {
@@
-282,7
+282,7
@@
main (void)
with open(dst, "r") as f:
out = f.read()
with open(dst, "r") as f:
out = f.read()
- self.assertEqual
s
(out, "Hello, world!\n")
+ self.assertEqual(out, "Hello, world!\n")
@skipIfNotAlive
def t_copy_files(self, host, user):
@skipIfNotAlive
def t_copy_files(self, host, user):