From 566d86ae46f05063653e3034c29becdae74ee12e Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Tue, 24 Aug 2021 08:07:43 +0200 Subject: [PATCH] Almost OK. Auto shutdown to be done. --- test.hdfs/test_hdf.py | 3 +-- test.hdfs/testme.py | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/test.hdfs/test_hdf.py b/test.hdfs/test_hdf.py index d0ab41a07..b661dbc00 100644 --- a/test.hdfs/test_hdf.py +++ b/test.hdfs/test_hdf.py @@ -32,8 +32,7 @@ class TestHDF(unittest.TestCase): reffile = "" def setUp(self): - salome.salome_close() - + salome.standalone() salome.salome_init(self.testfile, embedded=1) myStudyName = salome.myStudy._get_Name() self.session = salome.naming_service.Resolve('/Kernel/Session') diff --git a/test.hdfs/testme.py b/test.hdfs/testme.py index ec70cd79f..9dd3ebc0e 100644 --- a/test.hdfs/testme.py +++ b/test.hdfs/testme.py @@ -37,16 +37,11 @@ if __name__ == '__main__': tempdir = tempfile.gettempdir() testlogfile = tempdir + "/test.log" - # remove port file if any - try: - os.remove(portlogfile) - except: - pass isOk = True error = "" - proc = subprocess.Popen(["runSalome.py", "--modules", "SHAPER,GEOM,SHAPERSTUDY", "--gui", "--splash", "0", "test_hdf.py", "args:" + hdffile + "," + testdatafile + "," + testlogfile], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + proc = subprocess.Popen(["runSalomeSL.py", "--modules", "SHAPER,GEOM,SHAPERSTUDY", "--gui", "--splash", "0", "test_hdf.py", "args:" + hdffile + "," + testdatafile + "," + testlogfile], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) try: proc.communicate(timeout = testTimeout) except TimeoutExpired: -- 2.39.2