From ad182b9630c54b0ac8e9d2a5e92233c959fabf58 Mon Sep 17 00:00:00 2001 From: liuct Date: Thu, 4 Sep 2014 14:10:24 +0800 Subject: [PATCH] update test app obtaining --- testkitlite/capability/chrome_ubuntu.py | 2 +- testkitlite/engines/test_executer.py | 27 ++++++++------------------- testkitlite/engines/webdriver.py | 14 ++++++++------ 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/testkitlite/capability/chrome_ubuntu.py b/testkitlite/capability/chrome_ubuntu.py index 1a62c58..2cc6277 100644 --- a/testkitlite/capability/chrome_ubuntu.py +++ b/testkitlite/capability/chrome_ubuntu.py @@ -1,3 +1,3 @@ -def initCapability(test_app=None, debug_ip=None): +def initCapability(test_app=None, test_ext=None): capability = {'chrome.binary': '/usr/bin/chromium-browser'} return {'webdriver_url': 'http://127.0.0.1:9515', 'desired_capabilities': capability, 'test_prefix': 'file:///'} diff --git a/testkitlite/engines/test_executer.py b/testkitlite/engines/test_executer.py index 22e8b5a..8d5c2fc 100644 --- a/testkitlite/engines/test_executer.py +++ b/testkitlite/engines/test_executer.py @@ -49,11 +49,10 @@ class TestExecuter: self.exe_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) self.exe_socket.connect(self.exe_socket_file) self.TE_LOG = g_logger - signal.signal(signal.SIGINT, self.__exitHandler) - signal.signal(signal.SIGTERM, self.__exitHandler) - #for tizne xw self.debugip = test_env.get("debugip", '') self.appid = test_env.get("appid", '') + signal.signal(signal.SIGINT, self.__exitHandler) + signal.signal(signal.SIGTERM, self.__exitHandler) def __exitHandler(self, a, b): if self.web_driver: @@ -83,25 +82,15 @@ class TestExecuter: self.TE_LOG.error('Invalid webdriver target platform:%s' % self.target_platform) return False exec 'from testkitlite.capability.%s import initCapability' % self.target_platform - test_app = '' if self.wd_url == '': self.wd_url = DEFAULT_WD_URL - driver_env = {} - if self.target_platform.upper().find('ANDROID') >= 0: - test_name = self.suite_name.replace('-', '_') - test_pkg = 'org.xwalk.%s' % test_name - tmp_names = test_name.split('_') - test_app = ''.join([it.capitalize() for it in tmp_names if it]) - test_app = '.%s' % test_app - self.TE_LOG.debug('ANDROID platform, update the app name to %s' % test_app) - driver_env = initCapability(test_pkg, test_app) - elif self.target_platform.upper().find('TIZEN') >= 0: + test_app = test_ext = '' + if self.target_platform.upper().find('TIZEN'): test_app = self.appid - driver_env = initCapability(test_app, self.debugip) - else: - test_app = self.suite_name - driver_env = initCapability() - + test_ext = self.debugip + elif self.target_platform.upper().find('ANDROID'): + test_app, test_ext = self.appid.split('/') + driver_env = initCapability(test_app, test_ext) self.test_prefix = driver_env['test_prefix'] self.web_driver = WebDriver(self.wd_url, driver_env['desired_capabilities']) self.__updateTestPrefix() diff --git a/testkitlite/engines/webdriver.py b/testkitlite/engines/webdriver.py index bb7268a..ea16a06 100644 --- a/testkitlite/engines/webdriver.py +++ b/testkitlite/engines/webdriver.py @@ -147,7 +147,6 @@ class TestWorker(object): def init_test(self, params): """init the test envrionment""" - """init the test envrionment""" self.opts['testset_name'] = params.get('testset-name', '') self.opts['suite_name'] = params.get('testsuite-name', '') self.opts['debug_log_base'] = params.get("debug-log-base", '') @@ -158,11 +157,14 @@ 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 - #get tizen xw IP and appid - if self.opts['target_platform'].upper().find('TIZEN') >= 0: - _opts = self.conn.get_launcher_opt('xwalk', None, None, self.opts['suite_name'], self.opts['testset_name']) - self.opts['appid'] = _opts.get("test_app_id", '') if _opts else '' - self.opts['debugip'] = params.get("debugip", '') + test_launcher = params.get('test-launcher', '') + test_extension = params.get('test-extension', None) + test_widget = params.get('test-widget', None) + # get app id from commodule + _opts = self.conn.get_launcher_opt(test_launcher, test_extension, test_widget, \ + self.opts['suite_name'], self.opts['testset_name']) + self.opts['appid'] = _opts.get("test_app_id", '') if _opts else '' + self.opts['debugip'] = params.get("debugip", '') if not self.__exitExecuter(): LOGGER.debug('__exitExecuter failed') -- 2.7.4