Commit 32c1afb1 authored by Xiaowu Zhang's avatar Xiaowu Zhang

run-zelenium-test: change name for consistency with jstestnode

parent 9e68045f
...@@ -25,9 +25,9 @@ def main(): ...@@ -25,9 +25,9 @@ def main():
parser.add_argument('--node_quantity', help='ignored', type=int) parser.add_argument('--node_quantity', help='ignored', type=int)
parser.add_argument('--master_url', parser.add_argument('--master_url',
help='The Url of Master controling many suites') help='The Url of Master controling many suites')
parser.add_argument('--frontend_url', parser.add_argument('--remote_access_url',
help='The url of frontend of the test suite', help='The access url',
default = parser_configuration.get('frontend-url') default = parser_configuration.get('remote-access-url')
) )
parser.add_argument('--target', parser.add_argument('--target',
help='Target OS to run tests on', help='Target OS to run tests on',
...@@ -77,11 +77,11 @@ def main(): ...@@ -77,11 +77,11 @@ def main():
'version': args.target_version 'version': args.target_version
} }
if not args.appium_server_auth or not args.frontend_url: if not args.appium_server_auth or not args.remote_access_url:
sys.exit(-1) sys.exit(-1)
appium_url = "http://%s@ondemand.saucelabs.com/wd/hub" % (args.appium_server_auth) appium_url = "http://%s@ondemand.saucelabs.com/wd/hub" % (args.appium_server_auth)
# adjust make path to frontend # adjust make path to access url
# Do not store any test result in the ZMI # Do not store any test result in the ZMI
if args.run_only: if args.run_only:
url = "%s/erp5/portal_tests/%s/core/TestRunner.html" \ url = "%s/erp5/portal_tests/%s/core/TestRunner.html" \
...@@ -89,17 +89,17 @@ def main(): ...@@ -89,17 +89,17 @@ def main():
"&auto=on" \ "&auto=on" \
"&resultsUrl=../getId" \ "&resultsUrl=../getId" \
"&__ac_name=%s" \ "&__ac_name=%s" \
"&__ac_password=%s" % (args.frontend_url, args.run_only, {{ repr(user) }}, {{ repr(password) }}) "&__ac_password=%s" % (args.remote_access_url, args.run_only, {{ repr(user) }}, {{ repr(password) }})
else: else:
url = "%s/erp5/portal_tests/core/TestRunner.html" \ url = "%s/erp5/portal_tests/core/TestRunner.html" \
"?test=../test_suite_html" \ "?test=../test_suite_html" \
"&auto=on" \ "&auto=on" \
"&resultsUrl=../getId" \ "&resultsUrl=../getId" \
"&__ac_name=%s" \ "&__ac_name=%s" \
"&__ac_password=%s" % (args.frontend_url, {{ repr(user) }}, {{ repr(password) }}) "&__ac_password=%s" % (args.remote_access_url, {{ repr(user) }}, {{ repr(password) }})
# Wait until all activities are finished... # Wait until all activities are finished...
wait_url = args.frontend_url + '/erp5/Zuite_waitForActivities' wait_url = args.remote_access_url + '/erp5/Zuite_waitForActivities'
while 1: while 1:
try: try:
response = urlopen(wait_url) response = urlopen(wait_url)
......
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