X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=test%2Fconfig%2Foption_edit.py;h=f732dcf28e3b7407bfc838143f657da0377ad0b7;hb=e4906af5db78d7b0f7ff402b673d5702e2dee445;hp=f0a1b130b3a7105185a891bcb7ccacc1fe72ca07;hpb=0917d86acde72055f25aed5cee20faa69654e76a;p=tools%2Fsat.git diff --git a/test/config/option_edit.py b/test/config/option_edit.py index f0a1b13..f732dcf 100644 --- a/test/config/option_edit.py +++ b/test/config/option_edit.py @@ -28,9 +28,7 @@ sys.path.append(os.path.join(testdir, '..', '..')) sys.path.append(os.path.join(testdir, '..', '_testTools')) from salomeTools import Sat -import src -from tools import outRedirection -from tools import check_proc_existence_and_kill +from tools import check_proc_existence_and_kill_multi import HTMLTestRunner sleep_time = 3 @@ -46,13 +44,14 @@ class TestConfig(unittest.TestCase): OK = "KO" sat = Sat("-oUSER.editor='cooledit'") + sat.config() cmd_config = threading.Thread(target=sat.config, args=('-e',)) cmd_config.start() time.sleep(sleep_time) editor = sat.cfg.USER.editor - pid = check_proc_existence_and_kill(editor + ".*" + "salomeTools\.pyconf") + pid = check_proc_existence_and_kill_multi(editor + ".*" + "salomeTools\.pyconf", 10) if pid: OK = "OK" @@ -66,13 +65,14 @@ class TestConfig(unittest.TestCase): OK = "KO" sat = Sat("-oUSER.editor='cooledit'") + sat.config() cmd_config = threading.Thread(target=sat.config, args=('appli-test -e',)) cmd_config.start() time.sleep(sleep_time) editor = sat.cfg.USER.editor - pid = check_proc_existence_and_kill(editor + ".*" + "appli-test\.pyconf") + pid = check_proc_existence_and_kill_multi(editor + ".*" + "appli-test\.pyconf", 10) if pid: OK = "OK"