bos #26609 Patching tests (Windows)

diff --git a/src/ExchangePlugin/Test/TestImportImage_1.py b/src/ExchangePlugin/Test/TestImportImage_1.py
index 1c529e1963b575278c5d64d7b8a00703904e369d..1fcc4645bb4166a763985e8f373bcf8222615097 100755 (executable)
--- a/src/ExchangePlugin/Test/TestImportImage_1.py
+++ b/src/ExchangePlugin/Test/TestImportImage_1.py
@@ -99,6 +99,7 @@ assert(abs(dz-0) <= tol)
 
 # Close SALOME GUI
 import salome_utils
-import subprocess
+import killSalomeWithPort
+
 port = salome_utils.getPortNumber()
-proc = subprocess.Popen(["killSalomeWithPort.py", "{}".format(port)])
+killSalomeWithPort.killMyPort(port)

diff --git a/src/ExchangePlugin/Test/TestImportImage_2.py b/src/ExchangePlugin/Test/TestImportImage_2.py
index 94b328fb3a5cf87f5ad01f4645bb7bbc6ac70e37..7f26b06b2c46836c9126b54b6991ff8bfa5f76a3 100755 (executable)
--- a/src/ExchangePlugin/Test/TestImportImage_2.py
+++ b/src/ExchangePlugin/Test/TestImportImage_2.py
@@ -105,6 +105,7 @@ assert(abs(dz-0) <= tol)
 
 # Close SALOME GUI
 import salome_utils
-import subprocess
+import killSalomeWithPort
+
 port = salome_utils.getPortNumber()
-proc = subprocess.Popen(["killSalomeWithPort.py", "{}".format(port)])
+killSalomeWithPort.killMyPort(port)

diff --git a/src/ExchangePlugin/Test/testme.py b/src/ExchangePlugin/Test/testme.py
index 94e8622d6535c2eee51f02abfbd0089fde805139..99f241f65f748e94deb45d827aa48aa5e62e8ffd 100755 (executable)
--- a/src/ExchangePlugin/Test/testme.py
+++ b/src/ExchangePlugin/Test/testme.py
@@ -62,7 +62,8 @@ class SalomeSession(object):
     def __del__(self):
         port = os.getenv('NSPORT')
         import killSalomeWithPort
-        killSalomeWithPort.killMyPort(port)
+        if port:
+             killSalomeWithPort.killMyPort(port)
         return
     pass