0.6.7

[nepi.git] / test / execution / scheduler.py

diff --git a/test/execution/scheduler.py b/test/execution/scheduler.py
index 66191e2..a7e3e9e 100755 (executable)
--- a/test/execution/scheduler.py
+++ b/test/execution/scheduler.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
@@ -23,6 +22,8 @@ from nepi.util.timefuncs import tnow, stabsformat
 
 import unittest
 
+from six import next
+
 class SchedulerTestCase(unittest.TestCase):
     def test_task_order(self):
         def first():
@@ -50,14 +51,14 @@ class SchedulerTestCase(unittest.TestCase):
         scheduler.schedule(tsk1)
 
         # Make sure tasks are retrieved in teh correct order
-        tsk = scheduler.next()
-        self.assertEquals(tsk.callback(), 1)
+        tsk = next(scheduler)
+        self.assertEqual(tsk.callback(), 1)
         
-        tsk = scheduler.next()
-        self.assertEquals(tsk.callback(), 2)
+        tsk = next(scheduler)
+        self.assertEqual(tsk.callback(), 2)
         
-        tsk = scheduler.next()
-        self.assertEquals(tsk.callback(), 3)
+        tsk = next(scheduler)
+        self.assertEqual(tsk.callback(), 3)
 
 
 if __name__ == '__main__':