WIP

diff --git a/test.hdfs/CTestTestfileInstall.cmake b/test.hdfs/CTestTestfileInstall.cmake
index c421140eb9e05cac5daf914a779486d4145122a5..9b9c39d6239a54236300fc39a5caef0950d42f1d 100644 (file)
--- a/test.hdfs/CTestTestfileInstall.cmake
+++ b/test.hdfs/CTestTestfileInstall.cmake
@@ -20,7 +20,7 @@
 INCLUDE(tests.set)
 
 SET(COMPONENT_NAME     SHAPER)
-SET(PYTHON_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/python_test_driver.py")
+SET(PYTHON_TEST_DRIVER "testme.py")
 SET(TIMEOUT            600)
 
 FOREACH(tfile ${PUBLIC_TESTS})

diff --git a/test.hdfs/test_hdf.py b/test.hdfs/test_hdf.py
index b8ef1924e555cd3c2d3c900f99c0d356541529db..d0ab41a077273b9f029e2dad3bc6bd713615a45d 100644 (file)
--- a/test.hdfs/test_hdf.py
+++ b/test.hdfs/test_hdf.py
@@ -75,19 +75,8 @@ 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)

diff --git a/test.hdfs/testme.py b/test.hdfs/testme.py
index cd56bcd3a4e9ce1ed5349c5a8406668813a01406..ec70cd79fe1a48ebc01bfc9a4f056ce7dd617d69 100644 (file)
--- a/test.hdfs/testme.py
+++ b/test.hdfs/testme.py
@@ -36,7 +36,6 @@ if __name__ == '__main__':
     testdatafile = sys.argv[2]
 
   tempdir = tempfile.gettempdir()
-  portlogfile = tempdir + "/.salome_port"
   testlogfile = tempdir + "/test.log"
   # remove port file if any
   try:
@@ -47,7 +46,7 @@ if __name__ == '__main__':
   isOk = True
   error = ""
 
-  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)
+  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)
   try:
     proc.communicate(timeout = testTimeout)
   except TimeoutExpired: