[Checkins] SVN: zc.testbrowser/trunk/src/zc/testbrowser/ get more
tests running; everything up to the first getControl works
Benji York
benji at zope.com
Thu Sep 20 06:17:48 EDT 2007
Log message for revision 79759:
get more tests running; everything up to the first getControl works
Changed:
U zc.testbrowser/trunk/src/zc/testbrowser/interfaces.py
U zc.testbrowser/trunk/src/zc/testbrowser/real.js
U zc.testbrowser/trunk/src/zc/testbrowser/real.py
-=-
Modified: zc.testbrowser/trunk/src/zc/testbrowser/interfaces.py
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/interfaces.py 2007-09-20 03:19:35 UTC (rev 79758)
+++ zc.testbrowser/trunk/src/zc/testbrowser/interfaces.py 2007-09-20 10:17:47 UTC (rev 79759)
@@ -16,6 +16,10 @@
from zope import interface, schema
+class LinkNotFoundError(ValueError):
+ pass
+
+
class IBrowser(interface.Interface):
"""A Programmatic Web Browser."""
Modified: zc.testbrowser/trunk/src/zc/testbrowser/real.js
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/real.js 2007-09-20 03:19:35 UTC (rev 79758)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.js 2007-09-20 10:17:47 UTC (rev 79759)
@@ -63,11 +63,12 @@
}
function tb_get_link_by_id(id, index) {
- return tb_get_link_by_predicate(
- function (a) {
- alert(a.id + '|' + id + '|' + (a.id == id));
- return a.id == id;
- }, index)
+ var found = content.document.getElementById(id);
+ if (found != null) {
+ tb_tokens[tb_next_token] = found;
+ return tb_next_token++;
+ }
+ return false; // link not found
}
function tb_take_screen_shot(out_path) {
Modified: zc.testbrowser/trunk/src/zc/testbrowser/real.py
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/real.py 2007-09-20 03:19:35 UTC (rev 79758)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.py 2007-09-20 10:17:47 UTC (rev 79759)
@@ -47,7 +47,7 @@
if not js.strip():
return
self.telnet.write("'MARKER'")
- self.telnet.read_until('MARKER')
+ self.telnet.read_until('MARKER', self.timeout)
self.expect([PROMPT])
self.telnet.write(js)
i, match, text = self.expect([PROMPT])
@@ -180,8 +180,8 @@
% (simplejson.dumps(id), js_index))
if token == 'false':
- raise ValueError('Link not found: ' + msg)
- if token == 'ambiguity error':
+ raise zc.testbrowser.interfaces.LinkNotFoundError
+ elif token == 'ambiguity error':
raise ClientForm.AmbiguityError(msg)
return Link(token, self)
More information about the Checkins
mailing list