# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-import salome, os, sys
+import salome, salome_utils, os, sys
import SalomePyQt
import unittest
if len(sys.argv) > 2:
salomePortFile = sys.argv[2]
if len(sys.argv) > 3:
- sys.stderr = open(sys.argv[3], 'w')
+ errFile = open(sys.argv[3], 'w')
if len(sys.argv) > 4:
salomeKernelDir = sys.argv[4]
if len(sys.argv) > 5:
TestHDF.reffile = sys.argv[5]
aTest = unittest.TestLoader().loadTestsFromTestCase(TestHDF)
- unittest.TextTestRunner(stream=sys.stderr).run(aTest)
+ unittest.TextTestRunner(stream=errFile).run(aTest)
+ errFile.close()
-# test_program = unittest.main(argv=[sys.argv[0]], exit=False)
- proc = subprocess.Popen(salomeKernelDir + "/bin/salome/killSalome.py")
+ # close Salome GUI
+ port = salome_utils.getPortNumber()
+ proc = subprocess.Popen([salomeKernelDir + "/bin/salome/killSalomeWithPort.py", "{}".format(port)])
try:
os.remove(salomePortFile)
except:
print("Cannot remove file", file=f)
-
-# assert test_program.result.wasSuccessful(), "Test failed"