Python 3: porting tests

diff --git a/src/yacsloader_swig/Test/testExec.py b/src/yacsloader_swig/Test/testExec.py
index e6725579a7afd6aa18a05f2b5ddd85eb26c5d064..0c599b48f44c99ad2d29aa09b8619110d31a9ed9 100755 (executable)
--- a/src/yacsloader_swig/Test/testExec.py
+++ b/src/yacsloader_swig/Test/testExec.py
@@ -175,15 +175,16 @@ class TestExec(unittest.TestCase):
         self.assertEqual(101, self.p.getChildByName('node35').getEffectiveState())
         print("================= reach BREAKPOINT PARTIAL EXEC ==========")
         pass
-                          
+
     pass
 
 if __name__ == '__main__':
-  import os
-  U = os.getenv('USER')
-  f=open("/tmp/" + U + "/UnitTestsResult", 'a')
-  f.write("  --- TEST src/yacsloader: testExec.py\n")
-  suite = unittest.makeSuite(TestExec)
-  result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite)
-  f.close()
-  sys.exit(not result.wasSuccessful())
\ No newline at end of file
+    import os
+    import sys
+    U = os.getenv('USER')
+    with open(os.path.join("/tmp", U, "UnitTestsResult"), 'a') as f:
+        f.write("  --- TEST src/yacsloader: testExec.py\n")
+        suite = unittest.makeSuite(TestExec)
+        result = unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite)
+
+    sys.exit(not result.wasSuccessful())

diff --git a/src/yacsloader_swig/Test/testSaveLoadRun.py b/src/yacsloader_swig/Test/testSaveLoadRun.py
index 75c6f05ff304eab36ae503bf2d36ecfed18231b2..49ba4b963fc199722f7a52e0e5af90ba2deb901c 100755 (executable)
--- a/src/yacsloader_swig/Test/testSaveLoadRun.py
+++ b/src/yacsloader_swig/Test/testSaveLoadRun.py
@@ -1561,11 +1561,11 @@ o2=5*i1
     q.getChildByName("n1").getChildByName("n10").setScript("""
 import time
 time.sleep(0.1)
-print "execution n10:", i1
+print("execution n10:", i1)
 o2=5*i1
 """)
     q.getChildByName("n2").setScript("""
-print "execution n2:", i3
+print("execution n2:", i3)
 o4=i3
 """)
     loader.loadState(q, xmlStateFileName)