Allow testing for the presence of non-string items (they will be converted to strings); expand the 404 error; add a .form property that means .forms[0]; handle fully-qualified redirect properly

1 files changed, 11 insertions, 2 deletions

diff --git a/paste/fixture.py b/paste/fixture.py
index 1500df3..940c52f 100644
--- a/paste/fixture.py
+++ b/paste/fixture.py
@@ -354,8 +354,8 @@ class TestApp(object):
                 res.status >= 300 and res.status < 400):
                 return
             raise AppError(
-                "Bad response: %s (not 200 OK or 3xx redirect)"
-                % res.full_status)
+                "Bad response: %s (not 200 OK or 3xx redirect for %s)"
+                % (res.full_status, res.request.url))
         if status != res.status:
             raise AppError(
                 "Bad response: %s (not %s)" % (res.full_status, status))
@@ -397,6 +397,11 @@ class TestResponse(object):
 
     forms = property(forms__get)
 
+    def form__get(self):
+        return self.forms[0]
+
+    form = property(form__get)
+
     _tag_re = re.compile(r'<(/?)([a-z0-9_\-]*)(.*?)>')
 
     def _parse_forms(self):
@@ -612,6 +617,8 @@ class TestResponse(object):
         of the response.  Whitespace is normalized when searching
         for a string.
         """
+        if not isinstance(s, (str, unicode)):
+            s = str(s)
         return (self.body.find(s) != -1
                 or self.normal_body.find(s) != -1)
 
@@ -660,6 +667,8 @@ class TestRequest(object):
     disabled = True
 
     def __init__(self, url, environ, expect_errors=False):
+        if url.startswith('http://localhost'):
+            url = url[len('http://localhost'):]
         self.url = url
         self.environ = environ
         if environ.get('QUERY_STRING'):