self-tests pass

zopefoundation · Jul 21, 2007 · bd39da5 · bd39da5
1 parent 9527b54
commit bd39da5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/zope/testbrowser/testing.py b/src/zope/testbrowser/testing.py
@@ -130,13 +130,13 @@ class PublisherMechanizeBrowser(mechanize.Browser):
     default_others = ['_http_error', '_http_request_upgrade',
                       '_http_default_error']
     default_features = ['_redirect', '_cookies', '_referer', '_refresh',
-                        '_equiv', '_basicauth', '_digestauth', '_seek' ]
+                        '_equiv', '_basicauth', '_digestauth', ]
 
     def __init__(self, *args, **kws):
         inherited_handlers = ['_unknown', '_http_error',
             '_http_request_upgrade', '_http_default_error', '_basicauth',
             '_digestauth', '_redirect', '_cookies', '_referer',
-            '_refresh', '_equiv', '_seek', '_gzip']
+            '_refresh', '_equiv', '_gzip']
 
         self.handler_classes = {"http": PublisherHTTPHandler}
         for name in inherited_handlers:

diff --git a/src/zope/testbrowser/tests.py b/src/zope/testbrowser/tests.py
@@ -140,13 +140,12 @@ class FauxMechanizeBrowser(mechanize.Browser):
         "_refresh": mechanize.HTTPRefreshProcessor,
         "_referer": mechanize.Browser.handler_classes['_referer'],
         "_equiv": mechanize.HTTPEquivProcessor,
-        "_seek": mechanize.SeekableProcessor,
         }
 
     default_schemes = ["http"]
     default_others = ["_http_error", "_http_request_upgrade",
                       "_http_default_error"]
-    default_features = ["_authen", "_redirect", "_cookies", "_seek"]
+    default_features = ["_authen", "_redirect", "_cookies"]
 
 
 class Browser(browser.Browser):
@@ -354,6 +353,10 @@ def test_strip_linebreaks_from_textarea(self):
     '  Foo  '
     """
 
+class win32CRLFtransformer(object):
+    def sub(self, replacement, text):
+        return text.replace(r'\r','')
+
 checker = renormalizing.RENormalizing([
     (re.compile(r'^--\S+\.\S+\.\S+', re.M), '-'*30),
     (re.compile(r'boundary=\S+\.\S+\.\S+'), 'boundary='+'-'*30),
@@ -362,6 +365,8 @@ def test_strip_linebreaks_from_textarea(self):
     (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'),
+    (re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
+    (win32CRLFtransformer(), None),
     ])
 
 TestBrowserLayer = functional.ZCMLLayer(