Switch to SSL mode for tests : naive approach

diff --git a/src/ConnectorAPI/Test/CTestTestfileInstall.cmake b/src/ConnectorAPI/Test/CTestTestfileInstall.cmake
index 6c55e305ab50e175d47738fecfbdfce9ea38a5ff..1b92e61d4c0b8c9b3e91aa9fe90f13094cebf0ed 100644 (file)
--- a/src/ConnectorAPI/Test/CTestTestfileInstall.cmake
+++ b/src/ConnectorAPI/Test/CTestTestfileInstall.cmake
@@ -20,12 +20,12 @@
 INCLUDE(tests.set)
 
 SET(COMPONENT_NAME SHAPER)
-SET(SALOME_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/salome_test_driver.py")
+SET(PYTHON_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/python_test_driver.py")
 SET(TIMEOUT        300)
 
 
 FOREACH(tfile ${TEST_NAMES})
   SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
-  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  ADD_TEST(${TEST_NAME} python ${PYTHON_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/src/ConnectorAPI/Test/Test17917.py b/src/ConnectorAPI/Test/Test17917.py
index 0cd7bebd0ecf826ed059b96e8ad0f251e4c29083..5eab4d24879509d745226fd287dbf9c3708102df 100644 (file)
--- a/src/ConnectorAPI/Test/Test17917.py
+++ b/src/ConnectorAPI/Test/Test17917.py
@@ -17,6 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+import salome
+salome.standalone()
+salome.salome_init(1)
+
 from SketchAPI import *
 from salome.shaper import model
 from ModelAPI import *
@@ -44,13 +48,11 @@ model.exportToGEOM(partSet)
 model.end()
 
 # check what is exported to GEOM
-import salome
 from salome.geom import geomBuilder
 
 import os
 import tempfile
 
-salome.salome_init(1)
 aComp = salome.myStudy.FindComponent("GEOM")
 iterator = salome.myStudy.NewChildIterator(aComp)
 aComponents = []

diff --git a/src/ConnectorAPI/Test/Test18887.py b/src/ConnectorAPI/Test/Test18887.py
index 62d667f02422e245e559de6f50f56ae9d0984299..0821ae5855e21654794bab53e303d57b3200c73e 100644 (file)
--- a/src/ConnectorAPI/Test/Test18887.py
+++ b/src/ConnectorAPI/Test/Test18887.py
@@ -19,6 +19,7 @@
 import sys
 import salome
 
+salome.standalone()
 salome.salome_init()
 import salome_notebook
 ###

diff --git a/src/ConnectorAPI/Test/Test2882.py b/src/ConnectorAPI/Test/Test2882.py
index 640a91be2f96eb07ddae426272251e2ec99720f1..4e49849f8a76f61cf31f76035b4b127387cef5c4 100644 (file)
--- a/src/ConnectorAPI/Test/Test2882.py
+++ b/src/ConnectorAPI/Test/Test2882.py
@@ -21,6 +21,10 @@ from SketchAPI import *
 
 from salome.shaper import model
 
+import salome
+salome.standalone()
+salome.salome_init(1)
+
 model.begin()
 partSet = model.moduleDocument()
 Part_1 = model.addPart(partSet)
@@ -92,7 +96,6 @@ from salome.geom import geomBuilder
 import os
 import tempfile
 
-salome.salome_init(1)
 aComp = salome.myStudy.FindComponent("GEOM")
 iterator = salome.myStudy.NewChildIterator(aComp)
 aComponents = []

diff --git a/src/ConnectorAPI/Test/Test3195.py b/src/ConnectorAPI/Test/Test3195.py
index 40442aaa75e2f087ff2b61f59783eea362422e4d..a5de06a47dda3765c30cac4a093c852b6eed998b 100644 (file)
--- a/src/ConnectorAPI/Test/Test3195.py
+++ b/src/ConnectorAPI/Test/Test3195.py
@@ -19,6 +19,7 @@
 import sys
 import salome
 
+salome.standalone()
 salome.salome_init()
 ###
 ### SHAPER component

diff --git a/src/ConnectorAPI/Test/TestExportSTL.py b/src/ConnectorAPI/Test/TestExportSTL.py
index a033bfe27bc1e88830347ff179547265d2658589..9fe3a0802b2212b56ffde3c631021cda29b3f968 100644 (file)
--- a/src/ConnectorAPI/Test/TestExportSTL.py
+++ b/src/ConnectorAPI/Test/TestExportSTL.py
@@ -26,6 +26,7 @@
 #=========================================================================
 
 import salome
+salome.standalone()
 
 import os
 import math

diff --git a/src/ConnectorAPI/Test/TestExportToGEOM.py b/src/ConnectorAPI/Test/TestExportToGEOM.py
index c83767f768502da2f0f726e14652ebcb6ded892e..5d3809d494cb006b6ac3007de53d44fa5532b70e 100644 (file)
--- a/src/ConnectorAPI/Test/TestExportToGEOM.py
+++ b/src/ConnectorAPI/Test/TestExportToGEOM.py
@@ -20,11 +20,11 @@
 import salome
 from salome.shaper import model
 
-from salome.geom import geomBuilder
-
 import os
 import tempfile
 
+salome.standalone()
+from salome.geom import geomBuilder
 salome.salome_init(1)
 geompy = geomBuilder.New()
 

diff --git a/src/ConnectorAPI/Test/TestExportToGEOMAllGroupsAndFields.py b/src/ConnectorAPI/Test/TestExportToGEOMAllGroupsAndFields.py
index 1a4e7bb9e659e2c8ea169f1f33b89ad339a8cc73..27ed03a6f202a2c1d7f0125819f051e43317d27c 100644 (file)
--- a/src/ConnectorAPI/Test/TestExportToGEOMAllGroupsAndFields.py
+++ b/src/ConnectorAPI/Test/TestExportToGEOMAllGroupsAndFields.py
@@ -23,6 +23,7 @@ import tempfile
 import sys
 import salome
 
+salome.standalone()
 salome.salome_init()
 theStudy = salome.myStudy
 

diff --git a/src/ConnectorAPI/Test/TestExportToGEOMPartSet.py b/src/ConnectorAPI/Test/TestExportToGEOMPartSet.py
index d2b723ee3f63a52c800bd3dd947a46a59b9bd225..6bba07895a6a828184d8b2303c8212c2754ff539 100644 (file)
--- a/src/ConnectorAPI/Test/TestExportToGEOMPartSet.py
+++ b/src/ConnectorAPI/Test/TestExportToGEOMPartSet.py
@@ -21,11 +21,12 @@ import salome
 from ModelAPI import *
 from salome.shaper import model
 
-from salome.geom import geomBuilder
 
 import os
 import tempfile
 
+salome.standalone()
+from salome.geom import geomBuilder
 salome.salome_init(1)
 geompy = geomBuilder.New()
 

diff --git a/src/ConnectorAPI/Test/TestExportToGEOMWholeFeature.py b/src/ConnectorAPI/Test/TestExportToGEOMWholeFeature.py
index 4fabe756defe2183e1db916459cce275412b428f..abf2e7d9ceedc3239805ccb7ec4c8bb0abf6a040 100644 (file)
--- a/src/ConnectorAPI/Test/TestExportToGEOMWholeFeature.py
+++ b/src/ConnectorAPI/Test/TestExportToGEOMWholeFeature.py
@@ -21,11 +21,12 @@ import salome
 from SketchAPI import *
 from salome.shaper import model
 
-from salome.geom import geomBuilder
 
 import os
 import tempfile
 
+salome.standalone()
+from salome.geom import geomBuilder
 salome.salome_init(1)
 geompy = geomBuilder.New()
 

diff --git a/src/ConnectorAPI/Test/TestExportToGEOMWholeResult.py b/src/ConnectorAPI/Test/TestExportToGEOMWholeResult.py
index 2c51d8ae3807ca3dc10a1a025c93f310adb14907..6bccc592b18472544ebc8f623e946f97cfed0e75 100644 (file)
--- a/src/ConnectorAPI/Test/TestExportToGEOMWholeResult.py
+++ b/src/ConnectorAPI/Test/TestExportToGEOMWholeResult.py
@@ -20,11 +20,12 @@
 import salome
 from salome.shaper import model
 
-from salome.geom import geomBuilder
 
 import os
 import tempfile
 
+salome.standalone()
+from salome.geom import geomBuilder
 salome.salome_init(1)
 geompy = geomBuilder.New()
 

diff --git a/src/ConnectorAPI/Test/TestImportSTEP.py b/src/ConnectorAPI/Test/TestImportSTEP.py
index 61fed85b81608cc50a0c671b3d424e9935b413d0..a44cc9836669975bec8b1f067df476ea5c6b574b 100644 (file)
--- a/src/ConnectorAPI/Test/TestImportSTEP.py
+++ b/src/ConnectorAPI/Test/TestImportSTEP.py
@@ -41,6 +41,7 @@ from GeomAlgoAPI import *
 
 __updated__ = "2015-05-22"
 
+salome.standalone()
 salome.salome_init(1)
 
 #=========================================================================

diff --git a/src/ConnectorAPI/Test/TestImportSTL.py b/src/ConnectorAPI/Test/TestImportSTL.py
old mode 100755 (executable)
new mode 100644 (file)
index b55211e..3314ec4
--- a/src/ConnectorAPI/Test/TestImportSTL.py
+++ b/src/ConnectorAPI/Test/TestImportSTL.py
@@ -21,6 +21,7 @@ import os
 from salome.shaper import model
 
 import salome
+salome.standalone()
 salome.salome_init(1)
 
 data_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "data")