Changes in integration tests to run in Python3

Author: Ezequiel Torres

tests/integration_tests/integration_tests.py

@@ -183,12 +183,12 @@ def test_generation_7(self):
             self._run_x_generation(7)
 
     def _run_x_generation(self, gen_number):
-        print "Checking Generation %s" % gen_number
+        print("Checking Generation %s" % gen_number)
 
-        print "Check Indvidual properties..."
+        print("Check Indvidual properties...")
         self._check_indiv_values(gen_number)
 
-        print "Check Indvidual properties..."
+        print("Check Indvidual properties...")
         pop = self._mlc.get_generation(MLCIntegrationTest.EXPERIMENT_NAME, gen_number)
         self._check_indiv_property(gen_number, pop.get_individuals(), 'index', 'int')
         self._check_indiv_property(gen_number, pop.get_costs(), 'cost', 'float')
@@ -199,7 +199,7 @@ def _run_x_generation(self, gen_number):
     def _check_indiv_values(self, gen_number):
         i = 1
         indexes = self._mlc.get_generation(MLCIntegrationTest.EXPERIMENT_NAME, gen_number).get_individuals()
-        print "Check %s indviduals from generation %s" % (len(indexes), gen_number)
+        print("Check %s indviduals from generation %s" % (len(indexes), gen_number))
         for index in indexes:
             indiv = MLCRepository.get_instance().get_individual(index)
 
@@ -243,9 +243,9 @@ class IntegrationTest(MLCIntegrationTest):
 
 
 def execute_integration_test(test_dir, integration_test):
-    print "Running '%s' with %s generations: %s" % (integration_test['name'],
+    print("Running '%s' with %s generations: %s" % (integration_test['name'],
                                                     integration_test['generations'],
-                                                    integration_test['description'])
+                                                    integration_test['description']))
     suite = unittest.TestSuite()
     loader = unittest.TestLoader()
     suite.addTests(loader.loadTestsFromTestCase(get_test_class(test_dir, integration_test)))
@@ -264,7 +264,7 @@ def execute_integration_test(test_dir, integration_test):
             if test_name in all_tests:
                 test_to_run[test_name] = all_tests[test_name]
             else:
-                print "'%s'? there is no integration test with that name!" % test_name
+                print("'%s'? there is no integration test with that name!" % test_name)
 
     for test_dir, integration_test in test_to_run.items():
         execute_integration_test(test_dir, integration_test)

tests/integration_tests/run_tests.sh

@@ -2,7 +2,7 @@
 
 # Put the absolute path where the 'shared' python was installed
 export PYTHONPATH=$PYTHONPATH:../../
-NOSETESTS=/opt/mlc-python-2.7.11/bin/mlc_python
+NOSETESTS=/opt/mlc-python-3.6.2/bin/mlc_python
 
 # Run Integration tests
 $NOSETESTS integration_tests.py $@

tests/integration_tests/test_basic/default_evaluation_script.py

@@ -78,7 +78,7 @@ def cost(indiv):
     cost_mlc_y3 = None
     try:
         cost_mlc_y3 = float(np.sum((mlc_y3 - y2)**2))
-    except FloatingPointError, err:
+    except FloatingPointError as err:
         np.seterr(all='ignore')
         cost_mlc_y3 = float(np.sum((mlc_y3 - y2)**2))
         np.seterr(all='raise')

tests/integration_tests/test_multiple_controls/default_evaluation_script.py

@@ -78,7 +78,7 @@ def cost(indiv):
     cost_mlc_y3 = None
     try:
         cost_mlc_y3 = float(np.sum((mlc_y3 - y2)**2))
-    except FloatingPointError, err:
+    except FloatingPointError as err:
         np.seterr(all='ignore')
         cost_mlc_y3 = float(np.sum((mlc_y3 - y2)**2))
         np.seterr(all='raise')

tests/integration_tests/test_persist_reusing_simulations/default_evaluation_script.py

@@ -78,7 +78,7 @@ def cost(indiv):
     cost_mlc_y3 = None
     try:
         cost_mlc_y3 = float(np.sum((mlc_y3 - y2)**2))
-    except FloatingPointError, err:
+    except FloatingPointError as err:
         np.seterr(all='ignore')
         cost_mlc_y3 = float(np.sum((mlc_y3 - y2)**2))
         np.seterr(all='raise')

tests/integration_tests/test_persist_simulation/default_evaluation_script.py

@@ -78,7 +78,7 @@ def cost(indiv):
     cost_mlc_y3 = None
     try:
         cost_mlc_y3 = float(np.sum((mlc_y3 - y2)**2))
-    except FloatingPointError, err:
+    except FloatingPointError as err:
         np.seterr(all='ignore')
         cost_mlc_y3 = float(np.sum((mlc_y3 - y2)**2))
         np.seterr(all='raise')