X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fexecution%2Fec.py;h=ff7a8fa7df095885672edb49157390f78eb7943c;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=03040146fbc9ac26bedc6a81843730efc37232d1;hpb=99d8b2a4431d8fafd0385e189375106d46f1abd9;p=nepi.git

diff --git a/test/execution/ec.py b/test/execution/ec.py
index 03040146..ff7a8fa7 100755
--- a/test/execution/ec.py
+++ b/test/execution/ec.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
@@ -42,7 +41,7 @@ class ExecuteControllersTestCase(unittest.TestCase):
 
             time.sleep(1)
 
-        self.assertEquals('hola!', task.result)
+        self.assertEqual('hola!', task.result)
 
         ec.shutdown()
 
@@ -75,7 +74,7 @@ class ExecuteControllersTestCase(unittest.TestCase):
             # When this task is executed and the error raise,
             # the FailureManager should set its failure level to 
             # TASK_FAILURE
-            raise RuntimeError, "NOT A REAL ERROR. JUST TESTING!"
+            raise RuntimeError("NOT A REAL ERROR. JUST TESTING!")
 
         ec = ExperimentController()
 
@@ -88,7 +87,7 @@ class ExecuteControllersTestCase(unittest.TestCase):
 
             time.sleep(1)
 
-        self.assertEquals(task.status, TaskStatus.ERROR)
+        self.assertEqual(task.status, TaskStatus.ERROR)
 
 if __name__ == '__main__':
     unittest.main()