Finaly dont touch salome_test_driver and delegate SSL stuff to salome_instance.py

diff --git a/bin/appliskel/salome_tester/salome_instance.py b/bin/appliskel/salome_tester/salome_instance.py
index 2eaf70d3ef976b41b1c5c6f3b7ba18f2766c51f5..28e29853fa20823d41bf5a35e73ea074892bc587 100755 (executable)
--- a/bin/appliskel/salome_tester/salome_instance.py
+++ b/bin/appliskel/salome_tester/salome_instance.py
@@ -27,6 +27,8 @@ import os
 class SalomeInstance:
 
   def __init__(self):
+    import KernelBasis
+    KernelBasis.setSSLMode(False)
     self.port = None
   #
 

diff --git a/bin/appliskel/salome_tester/salome_test_driver.py b/bin/appliskel/salome_tester/salome_test_driver.py
index 7b0efad1760dd220a45c2c18cf3cca112b91e7fa..38888491f25b60e670d4fddb0d65594291b6b54a 100755 (executable)
--- a/bin/appliskel/salome_tester/salome_test_driver.py
+++ b/bin/appliskel/salome_tester/salome_test_driver.py
@@ -127,8 +127,6 @@ if __name__ == "__main__":
   from salome_instance import SalomeInstance
   res = 1
   try:
-    import KernelBasis
-    KernelBasis.setSSLMode(False)
     salome_instance = SalomeInstance.start(shutdown_servers=True)
     port = salome_instance.get_port()
     res, out, err = runTest(test_and_args)