Commit fb051b22 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

support svn trunk Zelenium.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25408 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 484709f7
...@@ -183,9 +183,18 @@ def runFirefox(): ...@@ -183,9 +183,18 @@ def runFirefox():
os.environ['DISPLAY'] = ':123' os.environ['DISPLAY'] = ':123'
os.environ['HOME'] = profile_dir os.environ['HOME'] = profile_dir
prepareFirefox() prepareFirefox()
# check if old zelenium or new zelenium
try:
urllib2.urlopen("http://%s:%d/%s/portal_tests/core/scripts/selenium-version.js" % \
(host, port, portal_name))
except urllib2.HTTPError:
# Zelenium 0.8
url_string = "http://%s:%d/%s/portal_tests/?auto=true&__ac_name=%s&__ac_password=%s"
else:
# Zelenium 0.8+ or later
url_string = "http://%s:%d/%s/portal_tests/core/TestRunner.html?test=..%%2Ftest_suite_html&auto=on&__ac_name=%s&__ac_password=%s"
pid = os.spawnlp(os.P_NOWAIT, "firefox", "firefox", "-profile", profile_dir, pid = os.spawnlp(os.P_NOWAIT, "firefox", "firefox", "-profile", profile_dir,
"http://%s:%d/%s/portal_tests/?auto=true&__ac_name=%s" url_string % (host, port, portal_name, user, password))
"&__ac_password=%s" % (host, port, portal_name, user, password))
os.environ['MOZ_NO_REMOTE'] = '0' os.environ['MOZ_NO_REMOTE'] = '0'
print 'firefox : %d' % pid print 'firefox : %d' % pid
return pid return pid
......
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