[Erp5-report] r8430 - /erp5/trunk/utils/erp5mechanize/ERP5Mechanize.py

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Jul 13 10:35:18 2006
New Revision: 8430

URL: http://svn.erp5.org?rev=8430&view=rev
Log:
Raise an exception when a link is not found when executing doAction.
Expand tuple received from functions to make value signification clearer.

Modified:
    erp5/trunk/utils/erp5mechanize/ERP5Mechanize.py

Modified: erp5/trunk/utils/erp5mechanize/ERP5Mechanize.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5mechanize/ERP5Mechanize.py?rev=8430&r1=8429&r2=8430&view=diff
==============================================================================
--- erp5/trunk/utils/erp5mechanize/ERP5Mechanize.py (original)
+++ erp5/trunk/utils/erp5mechanize/ERP5Mechanize.py Thu Jul 13 10:35:18 2006
@@ -29,6 +29,7 @@
 
 from mechanize import Browser
 from time import time
+from ClientForm import ItemNotFoundError
 
 class LoginError: pass
 
@@ -112,7 +113,7 @@
     if value in item_names:
       self.fillField(menu_name, [item_names[value]])
     else:
-      raise ClientForm.ItemNotFoundError, 'insufficient items with name \'%s\'' % (value, )
+      raise ItemNotFoundError, 'insufficient items with name \'%s\'' % (value, )
     request = self.browser.click(name=submit_name)
     return self.timeOpen(request)
 
@@ -126,6 +127,7 @@
         url = link.url
         if url.split('?', 1)[0].endswith(link_target):
           return self.timeOpen(url)
+      raise ItemNotFoundError, 'Link %s not found.' % (link_target, )
     elif submit_name is not None:
       self.selectMainForm()
       request = self.browser.click(name=submit_name)
@@ -462,8 +464,8 @@
     Execute function with given parameters.
     Returns a TimeResult instance.
   """
-  start = time()
-  duration = function(*args, **kw)
-  stop = time()
-  return TimeResult(id, duration[0], duration[1], start, stop)
-
+  test_start = time()
+  start, stop = function(*args, **kw)
+  test_stop = time()
+  return TimeResult(id, start, stop, test_start, test_stop)
+