[Checkins] SVN: zope.testbrowser/trunk/src/zope/testbrowser/ make
the tests more resilient to header formatting changes with the
Benji York
benji at zope.com
Sun May 6 16:31:42 EDT 2007
Log message for revision 75590:
make the tests more resilient to header formatting changes with the
REnormalizer
Changed:
U zope.testbrowser/trunk/src/zope/testbrowser/README.txt
U zope.testbrowser/trunk/src/zope/testbrowser/tests.py
-=-
Modified: zope.testbrowser/trunk/src/zope/testbrowser/README.txt
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/README.txt 2007-05-06 20:22:31 UTC (rev 75589)
+++ zope.testbrowser/trunk/src/zope/testbrowser/README.txt 2007-05-06 20:31:41 UTC (rev 75590)
@@ -136,9 +136,9 @@
The headers can be accessed as a string:
- >>> print browser.headers
- Status: 200 Ok
- Content-Length: ...
+ >>> print browser.headers # doctest: +REPORT_NDIFF
+ Status: 200 OK
+ Content-Length: 123
Content-Type: text/html;charset=utf-8
X-Powered-By: Zope (www.zope.org), Python (www.python.org)
Modified: zope.testbrowser/trunk/src/zope/testbrowser/tests.py
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/tests.py 2007-05-06 20:22:31 UTC (rev 75589)
+++ zope.testbrowser/trunk/src/zope/testbrowser/tests.py 2007-05-06 20:31:41 UTC (rev 75590)
@@ -359,9 +359,9 @@
(re.compile(r'boundary=\S+\.\S+\.\S+'), 'boundary='+'-'*30),
(re.compile(r'^---{10}.*', re.M), '-'*30),
(re.compile(r'boundary=-{10}.*'), 'boundary='+'-'*30),
- (re.compile('User-agent:\s+\S+'), 'User-agent: XXX'),
- (re.compile('Content-length:\s+\S+'), 'Content-length: 123'),
- (re.compile('Status: 200 O[Kk]'), 'Status: 200 OK'),
+ (re.compile(r'User-agent:\s+\S+'), 'User-agent: Python-urllib/2.4'),
+ (re.compile(r'Content-[Ll]ength:.*'), 'Content-Length: 123'),
+ (re.compile(r'Status: 200.*'), 'Status: 200 OK'),
])
TestBrowserLayer = functional.ZCMLLayer(
@@ -371,7 +371,8 @@
def test_suite():
from zope.testing import doctest
flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
- readme = FunctionalDocFileSuite('README.txt', optionflags=flags)
+ readme = FunctionalDocFileSuite('README.txt', optionflags=flags,
+ checker=checker)
readme.layer = TestBrowserLayer
wire = FunctionalDocFileSuite('over_the_wire.txt', optionflags=flags)
wire.level = 2
More information about the Checkins
mailing list