Merge branch 'V9_11_BR'

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

diff --git a/test.hdfs/test_hdf.py b/test.hdfs/test_hdf.py
index b8ef1924e555cd3c2d3c900f99c0d356541529db..4a08b4089b7dd589dbf7e5235dec34aca64a071d 100644 (file)
--- a/test.hdfs/test_hdf.py
+++ b/test.hdfs/test_hdf.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2021  CEA/DEN, EDF R&D
+# Copyright (C) 2014-2023  CEA, EDF
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -32,9 +32,8 @@ class TestHDF(unittest.TestCase):
   reffile = ""
 
   def setUp(self):
-    salome.salome_close()
-
-    salome.salome_init(self.testfile, embedded=1)
+    salome.standalone()
+    salome.salome_init(self.testfile, embedded=1, forced=True)
     myStudyName = salome.myStudy._get_Name()
     self.session = salome.naming_service.Resolve('/Kernel/Session')
     self.session.emitMessage("connect_to_study")
@@ -75,19 +74,12 @@ if __name__ == "__main__":
   if len(sys.argv) > 2:
     TestHDF.reffile = sys.argv[2]
   if len(sys.argv) > 3:
-    salomePortFile = sys.argv[3]
-  if len(sys.argv) > 4:
-    errFile = open(sys.argv[4], 'w')
+    errFile = open(sys.argv[3], 'w')
 
   aTest = unittest.TestLoader().loadTestsFromTestCase(TestHDF)
   unittest.TextTestRunner(stream=errFile).run(aTest)
   errFile.close()
-
-  # 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)
+  #import qtsalome
+  #qtsalome.qApp.closeAllWindows()
+  import signal
+  os.kill(os.getpid(),signal.SIGKILL)