From bb687f6b29a5e91b09fbfdab50f080f98afec36b Mon Sep 17 00:00:00 2001 From: liuct Date: Fri, 5 Sep 2014 22:23:01 +0800 Subject: [PATCH] fix wd_url issue --- packaging/testkit-lite.dsc | 2 +- testkitlite/engines/test_executer.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packaging/testkit-lite.dsc b/packaging/testkit-lite.dsc index 1c3f9f9..87a4a98 100644 --- a/packaging/testkit-lite.dsc +++ b/packaging/testkit-lite.dsc @@ -7,5 +7,5 @@ Standards-Version: 3.9.2 Homepage: https://github.com/testkit/testkit-manager Version: 3.1.7 Files: - 8e9812327cbf43f7a50997243a153644 1397957 testkit-lite_3.1.7.tar.gz + 1916afea77e634ede442f2722676d65b 1398130 testkit-lite_3.1.7.tar.gz diff --git a/testkitlite/engines/test_executer.py b/testkitlite/engines/test_executer.py index bbba9a0..38fb105 100644 --- a/testkitlite/engines/test_executer.py +++ b/testkitlite/engines/test_executer.py @@ -15,13 +15,13 @@ from testkitlite.util import tr_utils from testkitlite.util.log import LOGGER as g_logger from urlparse import urlparse -try: - from selenium.webdriver.remote.webdriver import WebDriver - from selenium.webdriver.support.ui import WebDriverWait -except ImportError, err: - g_logger.info("Failed to import 'selenium' module, please check your installation:") - g_logger.info(" You can use 'sudo pip install selenium' to install the module!") - raise ImportError +# try: +# from selenium.webdriver.remote.webdriver import WebDriver +# from selenium.webdriver.support.ui import WebDriverWait +# except ImportError, err: +# g_logger.info("Failed to import 'selenium' module, please check your installation:") +# g_logger.info(" You can use 'sudo pip install selenium' to install the module!") +# raise ImportError TE = None EXE_LOCK = threading.Lock() @@ -46,7 +46,7 @@ class TestExecuter: self.tests_json = '' self.target_platform = test_env['target_platform'] self.web_driver = None - self.wd_url = test_env.get("wd_url", DEFAULT_WD_URL) + self.wd_url = test_env.get("wd_url", '') or DEFAULT_WD_URL self.suite_name = test_env['suite_name'] self.set_type = test_env['set_type'] self.set_exetype = test_env['set_exetype'] -- 2.7.4