From f3790c36a5530c942f9dbafbc4ae32615192d510 Mon Sep 17 00:00:00 2001 From: Nicolas Geimer Date: Fri, 30 Jun 2017 15:55:53 +0200 Subject: [PATCH] [PY3] Still porting test... --- src/yacsloader_swig/Test/testEdit.py | 9 +++---- src/yacsloader_swig/Test/testLoader.py | 9 +++---- src/yacsloader_swig/Test/testProgress.py | 9 +++---- src/yacsloader_swig/Test/testRefcount.py | 15 ++++++----- src/yacsloader_swig/Test/testResume.py | 9 +++---- src/yacsloader_swig/Test/testSave.py | 28 ++++++++++----------- src/yacsloader_swig/Test/testSaveLoadRun.py | 9 +++---- 7 files changed, 41 insertions(+), 47 deletions(-) diff --git a/src/yacsloader_swig/Test/testEdit.py b/src/yacsloader_swig/Test/testEdit.py index a3fc8aa4d..ab9bb838a 100755 --- a/src/yacsloader_swig/Test/testEdit.py +++ b/src/yacsloader_swig/Test/testEdit.py @@ -198,9 +198,8 @@ def f(): if __name__ == '__main__': import os U = os.getenv('USER') - f=open("/tmp/" + U + "/UnitTestsResult", 'a') - f.write(" --- TEST src/yacsloader: testEdit.py\n") - suite = unittest.makeSuite(TestEdit) - result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite) - f.close() + with open("/tmp/" + U + "/UnitTestsResult", 'a') as f: + f.write(" --- TEST src/yacsloader: testEdit.py\n") + suite = unittest.makeSuite(TestEdit) + result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite) sys.exit(not result.wasSuccessful()) diff --git a/src/yacsloader_swig/Test/testLoader.py b/src/yacsloader_swig/Test/testLoader.py index 0083871b6..e1f4671d5 100755 --- a/src/yacsloader_swig/Test/testLoader.py +++ b/src/yacsloader_swig/Test/testLoader.py @@ -85,9 +85,8 @@ class TestLoader(unittest.TestCase): if __name__ == '__main__': import os U = os.getenv('USER') - f=open("/tmp/" + U + "/UnitTestsResult", 'a') - f.write(" --- TEST src/yacsloader: testLoader.py\n") - suite = unittest.makeSuite(TestLoader) - result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite) - f.close() + with open("/tmp/" + U + "/UnitTestsResult", 'a') as f: + f.write(" --- TEST src/yacsloader: testLoader.py\n") + suite = unittest.makeSuite(TestLoader) + result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite) sys.exit(not result.wasSuccessful()) diff --git a/src/yacsloader_swig/Test/testProgress.py b/src/yacsloader_swig/Test/testProgress.py index d9567343b..c9aea65db 100755 --- a/src/yacsloader_swig/Test/testProgress.py +++ b/src/yacsloader_swig/Test/testProgress.py @@ -133,9 +133,8 @@ class TestEdit(unittest.TestCase): if __name__ == '__main__': import os U = os.getenv('USER') - f=open("/tmp/" + U + "/UnitTestsResult", 'a') - f.write(" --- TEST src/yacsloader: testProgress.py\n") - suite = unittest.makeSuite(TestEdit) - result=unittest.TextTestRunner(f, descriptions=1, verbosity=3).run(suite) - f.close() + with open("/tmp/" + U + "/UnitTestsResult", 'a') as f: + f.write(" --- TEST src/yacsloader: testProgress.py\n") + suite = unittest.makeSuite(TestEdit) + result=unittest.TextTestRunner(f, descriptions=1, verbosity=3).run(suite) sys.exit(not result.wasSuccessful()) diff --git a/src/yacsloader_swig/Test/testRefcount.py b/src/yacsloader_swig/Test/testRefcount.py index efd29c782..599412751 100755 --- a/src/yacsloader_swig/Test/testRefcount.py +++ b/src/yacsloader_swig/Test/testRefcount.py @@ -268,11 +268,10 @@ class TestTypeCodeRef(unittest.TestCase): if __name__ == '__main__': import os U = os.getenv('USER') - f=open("/tmp/" + U + "/UnitTestsResult", 'a') - f.write(" --- TEST src/yacsloader: testRefcount.py\n") - suite1 = unittest.makeSuite(TestContainerRef) - suite2 = unittest.makeSuite(TestTypeCodeRef) - suite = unittest.TestSuite((suite1, suite2)) - result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite) - f.close() - sys.exit(not result.wasSuccessful()) \ No newline at end of file + with open("/tmp/" + U + "/UnitTestsResult", 'a') as f: + f.write(" --- TEST src/yacsloader: testRefcount.py\n") + suite1 = unittest.makeSuite(TestContainerRef) + suite2 = unittest.makeSuite(TestTypeCodeRef) + suite = unittest.TestSuite((suite1, suite2)) + result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite) + sys.exit(not result.wasSuccessful()) diff --git a/src/yacsloader_swig/Test/testResume.py b/src/yacsloader_swig/Test/testResume.py index f796f72cb..f7dc278de 100755 --- a/src/yacsloader_swig/Test/testResume.py +++ b/src/yacsloader_swig/Test/testResume.py @@ -88,9 +88,8 @@ class TestResume(unittest.TestCase): if __name__ == '__main__': import os U = os.getenv('USER') - f=open("/tmp/" + U + "/UnitTestsResult", 'a') - f.write(" --- TEST src/yacsloader: testResume.py\n") - suite = unittest.makeSuite(TestResume) - result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite) - f.close() + with open("/tmp/" + U + "/UnitTestsResult", 'a') as f: + f.write(" --- TEST src/yacsloader: testResume.py\n") + suite = unittest.makeSuite(TestResume) + result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite) sys.exit(not result.wasSuccessful()) diff --git a/src/yacsloader_swig/Test/testSave.py b/src/yacsloader_swig/Test/testSave.py index 644c8d8b4..1ecc00f2f 100755 --- a/src/yacsloader_swig/Test/testSave.py +++ b/src/yacsloader_swig/Test/testSave.py @@ -80,14 +80,15 @@ class TestSave(unittest.TestCase): except: pb = "unknown problem on " + fileOrig self.fail(pb) - s1=open(saveSchema1,'r') - s2=open(saveSchema2,'r') - d1=open(dumpSchema1,'r') - d2=open(dumpSchema2,'r') - ls1 = s1.readlines().sort() - ls2 = s2.readlines().sort() - ld1 = d1.readlines().sort() - ld2 = d2.readlines().sort() + + with open(saveSchema1,'r') as s1: + ls1 = s1.readlines().sort() + with open(saveSchema2,'r') as s2: + ls2 = s2.readlines().sort() + with open(dumpSchema1,'r') as d1: + ld1 = d1.readlines().sort() + with open(dumpSchema2,'r') as d2: + ld2 = d2.readlines().sort() pb1 = "file schemes produced by successive executions are not identical: " + fileOrig pb2 = "final dump states produced by successive executions are not identical: " + fileOrig self.assertEqual(ls1,ls2,pb1) @@ -97,9 +98,8 @@ class TestSave(unittest.TestCase): if __name__ == '__main__': import os U = os.getenv('USER') - f=open("/tmp/" + U + "/UnitTestsResult", 'a') - f.write(" --- TEST src/yacsloader: testSave.py\n") - suite = unittest.makeSuite(TestSave) - result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite) - f.close() - sys.exit(not result.wasSuccessful()) \ No newline at end of file + with open("/tmp/" + U + "/UnitTestsResult", 'a') as f: + f.write(" --- TEST src/yacsloader: testSave.py\n") + suite = unittest.makeSuite(TestSave) + 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 8cc06d351..ed08ddb6a 100755 --- a/src/yacsloader_swig/Test/testSaveLoadRun.py +++ b/src/yacsloader_swig/Test/testSaveLoadRun.py @@ -1636,9 +1636,8 @@ o2=2*i1 if __name__ == '__main__': import os,sys U = os.getenv('USER') - f=open("/tmp/" + U + "/UnitTestsResult", 'a') - f.write(" --- TEST src/yacsloader: testSaveLoadRun.py\n") - suite = unittest.makeSuite(TestSaveLoadRun) - result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite) - f.close() + with open("/tmp/" + U + "/UnitTestsResult", 'a') as f: + f.write(" --- TEST src/yacsloader: testSaveLoadRun.py\n") + suite = unittest.makeSuite(TestSaveLoadRun) + result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite) sys.exit(not result.wasSuccessful()) -- 2.39.2