X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fnode.py;h=c9fb8aef8bb1ddc2589b576fea7965be584ef1a6;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=e46f667339f183536e3b4872d14c9537d48cc680;hpb=1e2eb157cb569e9c28a5b7888ed97076d27414cb;p=nepi.git

diff --git a/test/resources/linux/node.py b/test/resources/linux/node.py
index e46f6673..c9fb8aef 100755
--- 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
@@ -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):