From: Anthony Geay Date: Wed, 18 Aug 2021 15:12:23 +0000 (+0200) Subject: Ready for the show X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fagy%2Fdsm_ssl;p=modules%2Fkernel.git Ready for the show --- diff --git a/CTestTestfileInstall.cmake.in b/CTestTestfileInstall.cmake.in index 3c6b54920..b6ee219e3 100644 --- a/CTestTestfileInstall.cmake.in +++ b/CTestTestfileInstall.cmake.in @@ -18,6 +18,7 @@ # 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(COMPONENT_NAME KERNEL) SET(TIMEOUT 200) diff --git a/src/SALOMESDS/CTestTestfileInstall.cmake b/src/SALOMESDS/CTestTestfileInstall.cmake index aa7fecdbf..125496459 100644 --- a/src/SALOMESDS/CTestTestfileInstall.cmake +++ b/src/SALOMESDS/CTestTestfileInstall.cmake @@ -19,6 +19,6 @@ IF(NOT WIN32) SET(TEST_NAME ${COMPONENT_NAME}_SalomeSDS) - ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSalomeSDS.py) + ADD_TEST(${TEST_NAME} ${PYTHON_TEST_DRIVER} ${TIMEOUT} TestSalomeSDS.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ENVIRONMENT "PYTHONPATH=${KERNEL_TEST_LIB}:$ENV{PYTHONPATH}") ENDIF(NOT WIN32) diff --git a/src/SALOMESDS/TestSalomeSDS.py b/src/SALOMESDS/TestSalomeSDS.py index baf5be0d5..54d3c1947 100644 --- a/src/SALOMESDS/TestSalomeSDS.py +++ b/src/SALOMESDS/TestSalomeSDS.py @@ -495,7 +495,6 @@ class SalomeSDSTest(unittest.TestCase): pass def setUp(self): - #salome.salome_init() salome.salome_init_without_session() pass