Revert "Tuleap24729. Full porting in SSL of BearingSeparator;Test20456;Test3061;Test3...

[modules/shaper.git] / test.hdfs / test_hdf.py

diff --git a/test.hdfs/test_hdf.py b/test.hdfs/test_hdf.py
index 75819433d4d7fabe52f3df829a3a343e47aa450e..b8ef1924e555cd3c2d3c900f99c0d356541529db 100644 (file)
--- 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)