From c456140cf388575f43f3cd815a8e2bf359077bb5 Mon Sep 17 00:00:00 2001 From: Christian Van Wambeke Date: Tue, 23 Jan 2018 10:31:17 +0100 Subject: [PATCH] move unittestpy outside obsolescent test dir --- AllTestLauncherSat.py | 2 +- test/config/test_option_edit.py | 2 +- test/config/test_option_value.py | 2 +- test/config/test_option_value_2.py | 2 +- test/jobs/test_jobs.py | 2 +- test/log/test_launch_browser.py | 2 +- test/log/test_launch_browser2.py | 2 +- test/prepare/test_clean.py | 3 +-- test/prepare/test_patch.py | 2 +- test/prepare/test_source.py | 2 +- {test/unittestpy => unittestpy}/HTMLTestRunner.py | 0 {test/unittestpy => unittestpy}/__init__.py | 0 {test/unittestpy => unittestpy}/tools.py | 0 13 files changed, 10 insertions(+), 11 deletions(-) rename {test/unittestpy => unittestpy}/HTMLTestRunner.py (100%) rename {test/unittestpy => unittestpy}/__init__.py (100%) rename {test/unittestpy => unittestpy}/tools.py (100%) diff --git a/AllTestLauncherSat.py b/AllTestLauncherSat.py index 1a2be07..59f4fbd 100755 --- a/AllTestLauncherSat.py +++ b/AllTestLauncherSat.py @@ -73,7 +73,7 @@ def errPrint(aStr): sys.stderr.write(aStr + '\n') try: - import test.unittestpy.HTMLTestRunner as HTST + import unittestpy.HTMLTestRunner as HTST except: HTST = None errPrint(""" diff --git a/test/config/test_option_edit.py b/test/config/test_option_edit.py index a106791..c6674e9 100755 --- a/test/config/test_option_edit.py +++ b/test/config/test_option_edit.py @@ -24,7 +24,7 @@ import time import unittest from src.salomeTools import Sat -from test.unittestpy.tools import check_proc_existence_and_kill_multi +from unittestpy.tools import check_proc_existence_and_kill_multi sleep_time = 2 diff --git a/test/config/test_option_value.py b/test/config/test_option_value.py index 73cfd56..50a7d84 100755 --- a/test/config/test_option_value.py +++ b/test/config/test_option_value.py @@ -23,7 +23,7 @@ import platform import unittest from src.salomeTools import Sat -from test.unittestpy.tools import outRedirection +from unittestpy.tools import outRedirection class TestCase(unittest.TestCase): """sat config --value""" diff --git a/test/config/test_option_value_2.py b/test/config/test_option_value_2.py index 413c462..c11fee1 100755 --- a/test/config/test_option_value_2.py +++ b/test/config/test_option_value_2.py @@ -23,7 +23,7 @@ import platform import unittest from src.salomeTools import Sat -from test.unittestpy.tools import outRedirection +from unittestpy.tools import outRedirection class TestCase(unittest.TestCase): """sat config -v VARS.python""" diff --git a/test/jobs/test_jobs.py b/test/jobs/test_jobs.py index 0a673a7..1b22378 100755 --- a/test/jobs/test_jobs.py +++ b/test/jobs/test_jobs.py @@ -22,7 +22,7 @@ import sys import unittest from src.salomeTools import Sat -from test.unittestpy.tools import outRedirection +from unittestpy.tools import outRedirection class TestCase(unittest.TestCase): "Test the jobs command""" diff --git a/test/log/test_launch_browser.py b/test/log/test_launch_browser.py index 03d261f..a9c8be4 100755 --- a/test/log/test_launch_browser.py +++ b/test/log/test_launch_browser.py @@ -26,7 +26,7 @@ import io import unittest from src.salomeTools import Sat -from test.unittestpy.tools import check_proc_existence_and_kill_multi +from unittestpy.tools import check_proc_existence_and_kill_multi sleep_time = 2 diff --git a/test/log/test_launch_browser2.py b/test/log/test_launch_browser2.py index deaf65e..38a6184 100755 --- a/test/log/test_launch_browser2.py +++ b/test/log/test_launch_browser2.py @@ -24,7 +24,7 @@ import time import unittest from src.salomeTools import Sat -from test.unittestpy.tools import check_proc_existence_and_kill_multi +from unittestpy.tools import check_proc_existence_and_kill_multi sleep_time = 2 diff --git a/test/prepare/test_clean.py b/test/prepare/test_clean.py index c753f8d..08bb54f 100755 --- a/test/prepare/test_clean.py +++ b/test/prepare/test_clean.py @@ -23,8 +23,7 @@ import unittest from src.salomeTools import Sat import src.product - -from test.unittestpy.tools import outRedirection +from unittestpy.tools import outRedirection class TestCase(unittest.TestCase): """Test of the clean command""" diff --git a/test/prepare/test_patch.py b/test/prepare/test_patch.py index ad7db31..1dc24d4 100755 --- a/test/prepare/test_patch.py +++ b/test/prepare/test_patch.py @@ -24,7 +24,7 @@ import unittest from src.salomeTools import Sat import src.product -from test.unittestpy.tools import outRedirection +from unittestpy.tools import outRedirection class TestCase(unittest.TestCase): """Test of the patch command""" diff --git a/test/prepare/test_source.py b/test/prepare/test_source.py index f60badc..f7a053d 100755 --- a/test/prepare/test_source.py +++ b/test/prepare/test_source.py @@ -23,7 +23,7 @@ import unittest from src.salomeTools import Sat import src.product -from test.unittestpy.tools import outRedirection +from unittestpy.tools import outRedirection class TestCase(unittest.TestCase): """Test of the source command""" diff --git a/test/unittestpy/HTMLTestRunner.py b/unittestpy/HTMLTestRunner.py similarity index 100% rename from test/unittestpy/HTMLTestRunner.py rename to unittestpy/HTMLTestRunner.py diff --git a/test/unittestpy/__init__.py b/unittestpy/__init__.py similarity index 100% rename from test/unittestpy/__init__.py rename to unittestpy/__init__.py diff --git a/test/unittestpy/tools.py b/unittestpy/tools.py similarity index 100% rename from test/unittestpy/tools.py rename to unittestpy/tools.py -- 2.39.2