From: cg246364 Date: Fri, 27 Aug 2021 15:18:16 +0000 (+0200) Subject: Revert "Tuleap24729. Full porting in SSL of BearingSeparator;Test20456;Test3061;Test3... X-Git-Tag: V9_8_0a1~23 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e6e20df69fd974a5c3b1baff4954838ca73bdcd2;p=modules%2Fshaper.git Revert "Tuleap24729. Full porting in SSL of BearingSeparator;Test20456;Test3061;Test3139 tests" This reverts commit ec78089677d98f984122fed70c87a7c26bcaca7f. --- diff --git a/test.hdfs/test_hdf.py b/test.hdfs/test_hdf.py index 75819433d..b8ef1924e 100644 --- a/test.hdfs/test_hdf.py +++ b/test.hdfs/test_hdf.py @@ -32,7 +32,8 @@ class TestHDF(unittest.TestCase): reffile = "" def setUp(self): - salome.standalone() + salome.salome_close() + salome.salome_init(self.testfile, embedded=1) myStudyName = salome.myStudy._get_Name() self.session = salome.naming_service.Resolve('/Kernel/Session') @@ -74,13 +75,19 @@ if __name__ == "__main__": if len(sys.argv) > 2: TestHDF.reffile = sys.argv[2] if len(sys.argv) > 3: - errFile = open(sys.argv[3], 'w') + salomePortFile = sys.argv[3] + if len(sys.argv) > 4: + errFile = open(sys.argv[4], 'w') aTest = unittest.TestLoader().loadTestsFromTestCase(TestHDF) unittest.TextTestRunner(stream=errFile).run(aTest) errFile.close() - #import qtsalome - #qtsalome.qApp.closeAllWindows() - import signal - os.kill(os.getpid(),signal.SIGKILL) - \ No newline at end of file + + # close Salome GUI + port = salome_utils.getPortNumber() + proc = subprocess.Popen(["killSalomeWithPort.py", "{}".format(port)]) + + try: + os.remove(salomePortFile) + except: + print("Cannot remove file", file=f) diff --git a/test.hdfs/testme.py b/test.hdfs/testme.py index 9dd3ebc0e..cd56bcd3a 100644 --- a/test.hdfs/testme.py +++ b/test.hdfs/testme.py @@ -36,12 +36,18 @@ if __name__ == '__main__': testdatafile = sys.argv[2] tempdir = tempfile.gettempdir() + portlogfile = tempdir + "/.salome_port" testlogfile = tempdir + "/test.log" + # remove port file if any + try: + os.remove(portlogfile) + except: + pass isOk = True error = "" - 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) + proc = subprocess.Popen(["runSalome.py", "--modules", "SHAPER,GEOM,SHAPERSTUDY", "--gui", "--splash", "0", "--ns-port-log=" + portlogfile, "test_hdf.py", "args:" + hdffile + "," + testdatafile + "," + portlogfile + "," + testlogfile], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) try: proc.communicate(timeout = testTimeout) except TimeoutExpired: