Ready for the show

diff --git a/CTestTestfileInstall.cmake.in b/CTestTestfileInstall.cmake.in
index 3c6b54920b010b186686bb02d57c4dcc5f99d7c6..b6ee219e3b6e3b34921ba26aff41d33422195ae8 100644 (file)
--- 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 aa7fecdbf59ef7008bff5d2df0681e6e986d894f..125496459bee84e6332bc0655fe49ca7a86b693f 100644 (file)
--- 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 baf5be0d505a5ea6f71e18bd4b3009be8a115b09..54d3c1947be98c6a7bdf268dc8f76557cb453063 100644 (file)
--- 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