Do not raise if the url is not available

Return a safe html selenium test code (which always fails) to indicate a problem when download a test. This will prevent Zelenium get Stalled during the launch.

Do not raise if the url is not available
Return a safe html selenium test code (which always fails) to indicate a problem when download a test. This will prevent Zelenium get Stalled during the launch.
13d47738 · Rafael Monnerat · b15455a0 · 13d47738 · 13d47738 · 13d47738
Commit 13d47738 authored Mar 06, 2012 by Rafael Monnerat
3 changed files
--- a/bt5/erp5_ui_test_core/ExtensionTemplateItem/ERP5Zuite.py
+++ b/bt5/erp5_ui_test_core/ExtensionTemplateItem/ERP5Zuite.py
 def UpdateImage(image):
  image._update_image_info()

-def urlread(url):
+def urlread(url, safe_return=0):
  import urllib
-  return urllib.urlopen(url).read()
+  try:
+    return urllib.urlopen(url).read()
+  except IOError, e:
+    if safe_return:
+      # Return an Selenium test code that will obviously fail. This 
+      # prevent zelenium test run get Stalled.
+      return """<html><body><table><tr><td>assertTextPresent</td>
+                <td>An error occurred when dowload %s : %s </td>
+                <td></td><tr></body></html>""" % (url , e)
+    raise IOError(e)
+ 

 def editZPT(zpt, text):
  zpt.pt_edit(text, 'text/html')

--- a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_runSeleniumTest.xml
+++ b/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_runSeleniumTest.xml
@@ -58,7 +58,7 @@ test_list = []\n
 count = 0\n
 for url in url_list:\n
 count += 1\n
- test_list.append((context.Zuite_urlRead(url), \'url%s\' % count),)\n
+ test_list.append((context.Zuite_urlRead(url, safe_return=1), \'%s %s\' % (count, url)),)\n
 \n
 return context.Zuite_createAndLaunchSeleniumTest(test_list=test_list,\n
                                                 zuite_id=zuite_id)\n

--- a/bt5/erp5_ui_test_core/bt/revision
+++ b/bt5/erp5_ui_test_core/bt/revision
-54
\ No newline at end of file
+55
\ No newline at end of file