update the importing issue handler

diff --git a/debian/files b/debian/files
index 7594d13..d7b94c3 100644 (file)
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-testkit-lite_3.1.6_all.deb utils standard
+testkit-lite_3.1.7_all.deb utils standard

diff --git a/packaging/testkit-lite.dsc b/packaging/testkit-lite.dsc
index 7ed1b8a..1c3f9f9 100644 (file)
--- a/packaging/testkit-lite.dsc
+++ b/packaging/testkit-lite.dsc
@@ -5,7 +5,7 @@ Maintainer: Lei Yang <lei.a.yang@intel.com>
 Build-Depends: debhelper (>= 8.0.0), python-setuptools, python-support (>= 0.8.4)
 Standards-Version: 3.9.2
 Homepage: https://github.com/testkit/testkit-manager
-Version: 3.1.6
+Version: 3.1.7
 Files:
- 5c5483e7e026c6256570fd4046045fc6 1398105 testkit-lite_3.1.6.tar.gz
+ 8e9812327cbf43f7a50997243a153644 1397957 testkit-lite_3.1.7.tar.gz
 

diff --git a/testkit-lite b/testkit-lite
index 0f8ab3d..b5e9419 100755 (executable)
--- a/testkit-lite
+++ b/testkit-lite
@@ -493,7 +493,7 @@ to resolve this issue" % (LOG_DIR)
     try:
         can_merge_result = True
         RUNNER.run_case(CURRENT_LOG_DIR)
-    except (TestEngineException, TestCaseNotFoundException), err:
+    except TestCaseNotFoundException, err:
         LOGGER.info("\n[ Error: exiting testkit-lite on error: %s ]\n" % err)
         unlock_and_exit()
     except Exception, err:
@@ -511,7 +511,7 @@ to resolve this issue" % (LOG_DIR)
         clean_testxml(TESTXMLS,remote_test)
         LOGGER.error("[ Error: merge result failed, error: %s ]\n" % err)
         unlock_and_exit()
-except KeyboardInterrupt, err:
+except (TestEngineException, KeyboardInterrupt), err:
     final_clean_test()
     LOGGER.info("\n[ exiting testkit-lite on user cancel ]\n")
     unlock_and_exit()

diff --git a/testkitlite/engines/test_executer.py b/testkitlite/engines/test_executer.py
index 86cb6fe..bbba9a0 100644 (file)
--- a/testkitlite/engines/test_executer.py
+++ b/testkitlite/engines/test_executer.py
@@ -15,6 +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
 
 TE = None
 EXE_LOCK = threading.Lock()
@@ -69,10 +76,6 @@ class TestExecuter:
                                                  url_components.netloc)
 
     def __initWebDriver(self):
-        from selenium.webdriver.remote.webdriver import WebDriver
-        from selenium.webdriver.support.ui import WebDriverWait
-        global WebDriver
-        global WebDriverWait
         if self.web_driver:
             self.web_driver.quit()
             self.web_driver = None

diff --git a/testkitlite/engines/webdriver.py b/testkitlite/engines/webdriver.py
index 319f52a..6e38027 100644 (file)
--- a/testkitlite/engines/webdriver.py
+++ b/testkitlite/engines/webdriver.py
@@ -157,7 +157,7 @@ class TestWorker(object):
         self.opts['session_dir'] = params.get("session_dir", '')
         self.opts['log_debug'] = params.get("log_debug", '')
         self.opts['exe_socket_file'] = self.exe_socket_file
-        test_launcher = params.get('test-launcher', '')
+        test_launcher = params.get('test-launcher', None) or 'xwalk'
         test_extension = params.get('test-extension', None)
         test_widget = params.get('test-widget', None)
         # get app id from commodule

diff --git a/testkitlite/util/httprequest.py b/testkitlite/util/httprequest.py
index b1a2574..0fe557b 100644 (file)
--- a/testkitlite/util/httprequest.py
+++ b/testkitlite/util/httprequest.py
@@ -16,9 +16,15 @@
 #           Liu,chengtao <chengtaox.liu@intel.com>
 """ The http request process module"""
 
-import requests
 import json
+from testkitlite.util.log import LOGGER
 
+try:
+    import requests
+except ImportError, err:
+    LOGGER.info("Failed to import 'requests' module, please check your installation:")
+    LOGGER.info("  You can use 'sudo pip install requests' to install the module!")
+    raise ImportError
 
 def get_url(baseurl, api):
     """get full url string"""