From e1d41446840e8663eb9a86fe546e6c2898f2d511 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 5 Nov 2021 15:59:38 +0300 Subject: [PATCH] [bos #26444] Fix tests --- src/ParametersPlugin/CMakeLists.txt | 2 +- src/ParametersPlugin/Test/TestImportInvalidParameters.py | 2 +- src/ParametersPlugin/Test/TestImportParameters.py | 2 +- src/ParametersPlugin/{ => Test}/data/invalid_parameters.txt | 0 src/ParametersPlugin/{ => Test}/data/parameters.txt | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename src/ParametersPlugin/{ => Test}/data/invalid_parameters.txt (100%) rename src/ParametersPlugin/{ => Test}/data/parameters.txt (100%) diff --git a/src/ParametersPlugin/CMakeLists.txt b/src/ParametersPlugin/CMakeLists.txt index 4244e870b..bd37033bd 100644 --- a/src/ParametersPlugin/CMakeLists.txt +++ b/src/ParametersPlugin/CMakeLists.txt @@ -137,5 +137,5 @@ if(${HAVE_SALOME}) endforeach(tfile ${TEST_NAMES}) install(FILES ${TMP_TESTS_NAMES} DESTINATION ${TEST_INSTALL_DIRECTORY}) - install(DIRECTORY data DESTINATION ${TEST_INSTALL_DIRECTORY}) + install(DIRECTORY Test/data DESTINATION ${TEST_INSTALL_DIRECTORY}) endif(${HAVE_SALOME}) diff --git a/src/ParametersPlugin/Test/TestImportInvalidParameters.py b/src/ParametersPlugin/Test/TestImportInvalidParameters.py index 1eac0e9f7..9faf17069 100644 --- a/src/ParametersPlugin/Test/TestImportInvalidParameters.py +++ b/src/ParametersPlugin/Test/TestImportInvalidParameters.py @@ -18,7 +18,7 @@ # from salome.shaper import model -import os, sys +import inspect, os, sys from PyQt5.Qt import QApplication diff --git a/src/ParametersPlugin/Test/TestImportParameters.py b/src/ParametersPlugin/Test/TestImportParameters.py index a09a45202..0a17a0f24 100644 --- a/src/ParametersPlugin/Test/TestImportParameters.py +++ b/src/ParametersPlugin/Test/TestImportParameters.py @@ -18,7 +18,7 @@ # from salome.shaper import model -import os +import inspect, os from PyQt5.Qt import QApplication diff --git a/src/ParametersPlugin/data/invalid_parameters.txt b/src/ParametersPlugin/Test/data/invalid_parameters.txt similarity index 100% rename from src/ParametersPlugin/data/invalid_parameters.txt rename to src/ParametersPlugin/Test/data/invalid_parameters.txt diff --git a/src/ParametersPlugin/data/parameters.txt b/src/ParametersPlugin/Test/data/parameters.txt similarity index 100% rename from src/ParametersPlugin/data/parameters.txt rename to src/ParametersPlugin/Test/data/parameters.txt -- 2.39.2