X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Futil%2Fsshfuncs.py;h=ba738b14d526aefaa49e56c72a93eab24e199f6a;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=539af78c58889a28ba8581c3723c3aa65022394f;hpb=cb5d027b813a27d7de263653e1a8e0cef5490f0a;p=nepi.git

diff --git a/test/util/sshfuncs.py b/test/util/sshfuncs.py
index 539af78c..ba738b14 100755
--- a/test/util/sshfuncs.py
+++ b/test/util/sshfuncs.py
@@ -47,7 +47,7 @@ def find_bin(name, extra_path = None):
             try:
                 os.stat(d + "/" + name)
                 return d + "/" + name
-            except OSError, e:
+            except OSError as e:
                 if e.errno != os.errno.ENOENT:
                     raise
     return None
@@ -178,7 +178,7 @@ class SSHfuncsTestCase(unittest.TestCase):
         (outremote, errrmote), premote = rexec(command, host, user, 
                 port = env.port, agent = True)
 
-        self.assertEquals(outlocal, outremote)
+        self.assertEqual(outlocal, outremote)
 
     def test_rcopy_list(self):
         env = test_environment()
@@ -204,9 +204,9 @@ class SSHfuncsTestCase(unittest.TestCase):
             files.extend(names)
         os.path.walk(destdir, recls, files)
         
-        origfiles = map(lambda s: os.path.basename(s), [dirpath, f.name, f1.name])
+        origfiles = [os.path.basename(s) for s in [dirpath, f.name, f1.name]]
 
-        self.assertEquals(sorted(origfiles), sorted(files))
+        self.assertEqual(sorted(origfiles), sorted(files))
 
         os.remove(f1.name)
         shutil.rmtree(dirpath)
@@ -236,9 +236,9 @@ class SSHfuncsTestCase(unittest.TestCase):
             files.extend(names)
         os.path.walk(destdir, recls, files)
        
-        origfiles = map(lambda s: os.path.basename(s), [dirpath, f.name, f1.name])
+        origfiles = [os.path.basename(s) for s in [dirpath, f.name, f1.name]]
 
-        self.assertEquals(sorted(origfiles), sorted(files))
+        self.assertEqual(sorted(origfiles), sorted(files))
 
     def test_rproc_manage(self):
         env = test_environment()
@@ -271,7 +271,7 @@ class SSHfuncsTestCase(unittest.TestCase):
                 port = env.port, 
                 agent = True)
 
-        self.assertEquals(status, ProcStatus.RUNNING)
+        self.assertEqual(status, ProcStatus.RUNNING)
 
         rkill(pid, ppid,
                 host = host,
@@ -285,7 +285,7 @@ class SSHfuncsTestCase(unittest.TestCase):
                 port = env.port, 
                 agent = True)
         
-        self.assertEquals(status, ProcStatus.FINISHED)
+        self.assertEqual(status, ProcStatus.FINISHED)
 
 
 if __name__ == '__main__':