@@ -91,7 +91,7 @@ def __updateTestPrefix(self):
91
91
if url_components .scheme == 'http' :
92
92
self .test_prefix = '%s://%s/' % (url_components .scheme ,
93
93
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 :
95
95
url_components = urlparse (current_url )
96
96
self .test_prefix = '%s://%s/' % (url_components .scheme ,
97
97
url_components .netloc )
@@ -125,6 +125,14 @@ def __initWebDriver(self):
125
125
self .test_prefix = driver_env ['test_prefix' ]
126
126
self .wd_url = driver_env ['webdriver_url' ]
127
127
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 ()
128
136
elif self .target_platform .upper ().find ('ANDROID' ) >= 0 and self .launcher != "CordovaLauncher" :
129
137
test_app , test_ext = self .appid .split ('/' )
130
138
test_ext = test_ext .strip ('.' ).replace ('Activity' , '' )
@@ -322,13 +330,10 @@ def __runRefTests(self, haha=None, kkkk=None):
322
330
except Exception , e :
323
331
i_case_timeout = DEFAULT_TIMEOUT
324
332
325
- self .__initWebDriver ()
326
333
i_page_url = '%s%s' % (self .test_prefix , i_case ['entry' ])
327
334
328
335
try :
329
- self .web_driver .set_page_load_timeout (i_case_timeout )
330
336
self .web_driver .get (i_page_url )
331
- self .web_driver .implicitly_wait (i_case ['onload_delay' ])
332
337
except Exception , e :
333
338
i_case ['result' ] = STR_BLOCK
334
339
self .TE_LOG .info (
@@ -362,12 +367,9 @@ def __runRefTests(self, haha=None, kkkk=None):
362
367
except Exception , e :
363
368
i_refer_case_timeout = DEFAULT_TIMEOUT
364
369
365
- self .__initWebDriver ()
366
370
i_ref_page_url = '%s%s' % (self .test_prefix , i_case ['refer_entry' ])
367
371
try :
368
- self .web_driver .set_page_load_timeout (i_refer_case_timeout )
369
372
self .web_driver .get (i_ref_page_url )
370
- self .web_driver .implicitly_wait (i_case ['onload_delay' ])
371
373
except Exception , e :
372
374
i_case ['result' ] = STR_BLOCK
373
375
self .TE_LOG .info (
0 commit comments