Skip to content

Commit c70dfb7

Browse files
authored
Enable webdriver test on IoT Linux platform. (#141)
1 parent 83526dc commit c70dfb7

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

testkit-lite

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,9 @@ to resolve this issue" % (LOG_DIR)
381381
elif conn_opt['commodule'] == 'windowshttp':
382382
targetplatform = "xw_windows"
383383
os.environ['targetplatform'] = targetplatform
384+
elif conn_opt['commodule'] == 'iot':
385+
targetplatform = "xw_iot"
386+
os.environ['targetplatform'] = targetplatform
384387

385388
# process test environ
386389
if OPTIONS.test_env:
@@ -406,6 +409,8 @@ to resolve this issue" % (LOG_DIR)
406409
webdriver_vars = initCapability('TEST_PKG_NAME', 'TEST_ACTIVITY_NAME')
407410
elif targetplatform.upper().find('WINDOW') >= 0:
408411
webdriver_vars = initCapability('TEST_PKG_NAME', 'DEVICE_ID')
412+
elif targetplatform.upper().find('IOT') >= 0:
413+
webdriver_vars = initCapability('DEVICE_ID', 'TEST_PKG_NAME')
409414
else:
410415
webdriver_vars = initCapability()
411416
os.environ['WEBDRIVER_VARS'] = json.dumps(webdriver_vars)

testkitlite/capability/xw_iot.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
def initCapability(device_id, test_suite_name):
2+
capability = {'xwalkOptions': {'binary': "", "iotPackage": test_suite_name}}
3+
return {'webdriver_url':"http://%s:9515" % device_id, 'desired_capabilities': capability}

testkitlite/engines/test_executer.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def __updateTestPrefix(self):
9191
if url_components.scheme == 'http':
9292
self.test_prefix = '%s://%s/' % (url_components.scheme,
9393
url_components.netloc)
94-
elif self.target_platform.upper().find('TIZEN') >=0:
94+
elif self.target_platform.upper().find('TIZEN') >=0 or self.target_platform.upper().find('IOT') >=0:
9595
url_components = urlparse(current_url)
9696
self.test_prefix = '%s://%s/' % (url_components.scheme,
9797
url_components.netloc)
@@ -125,6 +125,14 @@ def __initWebDriver(self):
125125
self.test_prefix = driver_env['test_prefix']
126126
self.wd_url = driver_env['webdriver_url']
127127
self.web_driver = WebDriver(self.wd_url, capa)
128+
elif self.target_platform.upper().find('IOT') >= 0:
129+
device_ip = str(self.device_id.split('@')[1])
130+
driver_env = initCapability(str(device_ip), self.appid)
131+
capa = driver_env['desired_capabilities']
132+
self.wd_url = driver_env['webdriver_url']
133+
self.web_driver = WebDriver(self.wd_url, capa)
134+
time.sleep(3)
135+
self.__updateTestPrefix()
128136
elif self.target_platform.upper().find('ANDROID') >= 0 and self.launcher != "CordovaLauncher":
129137
test_app, test_ext = self.appid.split('/')
130138
test_ext = test_ext.strip('.').replace('Activity', '')
@@ -322,13 +330,10 @@ def __runRefTests(self, haha=None, kkkk=None):
322330
except Exception, e:
323331
i_case_timeout = DEFAULT_TIMEOUT
324332

325-
self.__initWebDriver()
326333
i_page_url = '%s%s' % (self.test_prefix, i_case['entry'])
327334

328335
try:
329-
self.web_driver.set_page_load_timeout(i_case_timeout)
330336
self.web_driver.get(i_page_url)
331-
self.web_driver.implicitly_wait(i_case['onload_delay'])
332337
except Exception, e:
333338
i_case['result'] = STR_BLOCK
334339
self.TE_LOG.info(
@@ -362,12 +367,9 @@ def __runRefTests(self, haha=None, kkkk=None):
362367
except Exception, e:
363368
i_refer_case_timeout = DEFAULT_TIMEOUT
364369

365-
self.__initWebDriver()
366370
i_ref_page_url = '%s%s' % (self.test_prefix, i_case['refer_entry'])
367371
try:
368-
self.web_driver.set_page_load_timeout(i_refer_case_timeout)
369372
self.web_driver.get(i_ref_page_url)
370-
self.web_driver.implicitly_wait(i_case['onload_delay'])
371373
except Exception, e:
372374
i_case['result'] = STR_BLOCK
373375
self.TE_LOG.info(

0 commit comments

Comments
 (0)