X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fexecution%2Frunner.py;h=e6f43be8a66683594fdd71a5df45ebdecfd7dce4;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=b06d3832344775e9e96ec727de1e172be728344a;hpb=6c439bea6cf4d6af7512fc746dca75118bf39d39;p=nepi.git

diff --git a/test/execution/runner.py b/test/execution/runner.py
index b06d3832..e6f43be8 100755
--- a/test/execution/runner.py
+++ b/test/execution/runner.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
@@ -102,7 +101,7 @@ class RunnerTestCase(unittest.TestCase):
         apps = list()
         ifaces = list()
 
-        for i in xrange(node_count):
+        for i in range(node_count):
             node = ec.register_resource("dummy::Node")
             nodes.append(node)
             
@@ -110,7 +109,7 @@ class RunnerTestCase(unittest.TestCase):
             ec.register_connection(node, iface)
             ifaces.append(iface)
 
-            for i in xrange(app_count):
+            for i in range(app_count):
                 app = ec.register_resource("dummy::Application")
                 ec.register_connection(node, app)
                 apps.append(app)
@@ -124,7 +123,7 @@ class RunnerTestCase(unittest.TestCase):
         runs = rnr.run(ec, min_runs = 5, max_runs = 10, wait_guids = apps, 
                 wait_time = 0)
 
-        self.assertEquals(runs, 10)
+        self.assertEqual(runs, 10)
 
     def test_runner_convergence(self):
         node_count = 4
@@ -137,7 +136,7 @@ class RunnerTestCase(unittest.TestCase):
         apps = list()
         ifaces = list()
 
-        for i in xrange(node_count):
+        for i in range(node_count):
             node = ec.register_resource("dummy::Node")
             nodes.append(node)
             
@@ -145,7 +144,7 @@ class RunnerTestCase(unittest.TestCase):
             ec.register_connection(node, iface)
             ifaces.append(iface)
 
-            for i in xrange(app_count):
+            for i in range(app_count):
                 app = ec.register_resource("dummy::Application")
                 ec.register_connection(node, app)
                 apps.append(app)
@@ -168,7 +167,7 @@ class RunnerTestCase(unittest.TestCase):
                 wait_guids = apps, 
                 wait_time = 0)
 
-        self.assertEquals(runs, 10)
+        self.assertEqual(runs, 10)
                        
 if __name__ == '__main__':
     unittest.main()