Commit 27f3e1c2 authored by Ivan Tyagov's avatar Ivan Tyagov

Adjust URL to use frontend only in case we use appium. In all other cases keep u…

…se default way to provide backwards compatability.

This commit fixes backwards compatibility after a regressions introduced in !109.

Following test results prove it works:

https://nexedi.erp5.net/test_result_module/20161104-7A7E676

https://nexedi.erp5.net/test_result_module/20161104-15D828A5

/reviewed-on !112
parent 48ff2c7f
......@@ -119,11 +119,12 @@ def main():
appium_url = "http://%s@ondemand.saucelabs.com/wd/hub" % (args.appium_server_auth)
browser = webdriver.Remote(appium_url, capabilities)
is_browser_running = True
full_path = '$${runTestSuite-instance:buildout-directory}/software_release/parts/%s' % parsed_parameters['test-url']
full_path = full_path.split('srv')[-1]
url = "%s%s" % (args.frontend_url, full_path)
# adjust make path to testnode's frontend
full_path = '$${runTestSuite-instance:buildout-directory}/software_release/parts/%s' % parsed_parameters['test-url']
full_path = full_path.split('srv')[-1]
url = "%s%s" % (args.frontend_url, full_path)
is_browser_running = True
agent = browser.execute_script("return navigator.userAgent")
print agent
print url
......
......@@ -107,7 +107,7 @@ mode = 0644
[template-runTestSuite]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/runTestSuite.in
md5sum = f78b3205a6a2af6fc2d437fdf30440f6
md5sum = ef4118cb653838bf5c875c6fcac1677f
output = ${buildout:directory}/runTestSuite.in
mode = 0644
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment