[Erp5-report] r25408 - /erp5/trunk/products/ERP5Type/tests/runFunctionalTest.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Feb  2 10:30:05 2009
New Revision: 25408

URL: http://svn.erp5.org?rev=25408&view=rev
Log:
support svn trunk Zelenium.

Modified:
    erp5/trunk/products/ERP5Type/tests/runFunctionalTest.py

Modified: erp5/trunk/products/ERP5Type/tests/runFunctionalTest.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/runFunctionalTest.py?rev=25408&r1=25407&r2=25408&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/runFunctionalTest.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/runFunctionalTest.py [utf8] Mon Feb  2 10:30:05 2009
@@ -183,9 +183,18 @@
   os.environ['DISPLAY'] = ':123'
   os.environ['HOME'] = profile_dir
   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,
-      "http://%s:%d/%s/portal_tests/?auto=true&__ac_name=%s"
-          "&__ac_password=%s" % (host, port, portal_name, user, password))
+      url_string % (host, port, portal_name, user, password))
   os.environ['MOZ_NO_REMOTE'] = '0'
   print 'firefox : %d' % pid
   return pid