Merge branch 'tests'

[nepi.git] / test / resources / linux / node.py

diff --git a/test/resources/linux/node.py b/test/resources/linux/node.py
index e46f667..86b93e3 100755 (executable)
--- a/test/resources/linux/node.py
+++ b/test/resources/linux/node.py
@@ -4,9 +4,8 @@
 #    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.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -32,13 +31,13 @@ import unittest
 
 class LinuxNodeTestCase(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.ubuntu_host = "roseval.pl.sophia.inria.fr"
+        self.ubuntu_host = "ubuntu.pl.sophia.inria.fr"
         self.ubuntu_user = "inria_nepi"
         
-        self.target = "nepi5.pl.sophia.inria.fr"
+        self.target = "nepi.pl.sophia.inria.fr"
 
     @skipIfNotAlive
     def t_execute(self, host, user):
@@ -99,7 +98,7 @@ class LinuxNodeTestCase(unittest.TestCase):
  
         # get the pid of the process
         ecode = node.exitcode(app_home)
-        self.assertEquals(ecode, ExitCode.OK)
+        self.assertEqual(ecode, ExitCode.OK)
 
     @skipIfNotAlive
     def t_exitcode_kill(self, host, user):
@@ -126,17 +125,17 @@ class LinuxNodeTestCase(unittest.TestCase):
 
         # The process is still running, so no retfile has been created yet
         ecode = node.exitcode(app_home)
-        self.assertEquals(ecode, ExitCode.FILENOTFOUND)
+        self.assertEqual(ecode, ExitCode.FILENOTFOUND)
         
         (out, err), proc = node.check_errors(app_home)
-        self.assertEquals(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)
-        self.assertEquals(err, "")
+        self.assertEqual(err, "")
 
     @skipIfNotAlive
     def t_exitcode_error(self, host, user):
@@ -161,7 +160,7 @@ class LinuxNodeTestCase(unittest.TestCase):
         ecode = node.exitcode(app_home)
 
         # bash erro 127 - command not found
-        self.assertEquals(ecode, 127)
+        self.assertEqual(ecode, 127)
  
         (out, err), proc = node.check_errors(app_home)
 
@@ -173,16 +172,16 @@ class LinuxNodeTestCase(unittest.TestCase):
 
         node.find_home()
         (out, err), proc = node.mkdir(node.node_home, clean = True)
-        self.assertEquals(err, "")
+        self.assertEqual(err, "")
 
         (out, err), proc = node.install_packages("gcc", node.node_home)
-        self.assertEquals(err, "")
+        self.assertEqual(err, "")
 
         (out, err), proc = node.remove_packages("gcc", node.node_home)
-        self.assertEquals(err, "")
+        self.assertEqual(err, "")
 
         (out, err), proc = node.rmdir(node.exp_home)
-        self.assertEquals(err, "")
+        self.assertEqual(err, "")
 
     @skipIfNotAlive
     def t_clean(self, host, user):
@@ -195,24 +194,24 @@ class LinuxNodeTestCase(unittest.TestCase):
         command1 = " [ -d %s ] && echo 'Found'" % node.lib_dir
         (out, err), proc = node.execute(command1)
     
-        self.assertEquals(out.strip(), "Found")
+        self.assertEqual(out.strip(), "Found")
 
         command2 = " [ -d %s ] && echo 'Found'" % node.node_home
         (out, err), proc = node.execute(command2)
     
-        self.assertEquals(out.strip(), "Found")
+        self.assertEqual(out.strip(), "Found")
 
         node.clean_experiment()
         
         (out, err), proc = node.execute(command2)
 
-        self.assertEquals(out.strip(), "")
+        self.assertEqual(out.strip(), "")
 
         node.clean_home()
         
         (out, err), proc = node.execute(command1)
 
-        self.assertEquals(out.strip(), "")
+        self.assertEqual(out.strip(), "")
 
     @skipIfNotAlive
     def t_xterm(self, host, user):
@@ -220,16 +219,16 @@ class LinuxNodeTestCase(unittest.TestCase):
 
         node.find_home()
         (out, err), proc = node.mkdir(node.node_home, clean = True)
-        self.assertEquals(err, "")
+        self.assertEqual(err, "")
         
         node.install_packages("xterm", node.node_home)
-        self.assertEquals(err, "")
+        self.assertEqual(err, "")
 
         (out, err), proc = node.execute("xterm", forward_x11 = True)
-        self.assertEquals(err, "")
+        self.assertEqual(err, "")
 
         (out, err), proc = node.remove_packages("xterm", node.node_home)
-        self.assertEquals(err, "")
+        self.assertEqual(err, "")
 
     @skipIfNotAlive
     def t_compile(self, host, user):
@@ -263,7 +262,7 @@ main (void)
         command = "%s/hello" % app_home 
         (out, err), proc = node.execute(command)
 
-        self.assertEquals(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" % {
@@ -280,11 +279,10 @@ main (void)
         node.remove_packages("gcc", app_home)
         node.rmdir(app_home)
 
-        f = open(dst, "r")
-        out = f.read()
-        f.close()
+        with open(dst, "r") as f:
+            out = f.read()
         
-        self.assertEquals(out, "Hello, world!\n")
+        self.assertEqual(out, "Hello, world!\n")
 
     @skipIfNotAlive
     def t_copy_files(self, host, user):