everything passing except the rereading of wsgi.input

1 files changed, 2 insertions, 16 deletions

diff --git a/tests/test_request_form.py b/tests/test_request_form.py
index 9c43b46..8aa6e29 100644
--- a/tests/test_request_form.py
+++ b/tests/test_request_form.py
@@ -17,31 +17,17 @@ def make_post(body):
     e = {
         'CONTENT_TYPE': 'application/x-www-form-urlencoded',
         'CONTENT_LENGTH': str(len(body)),
+        'REQUEST_METHOD': 'POST',
         'wsgi.input': StringIO(body),
         }
     return e
 
-def cmp_post(fs, lst):
-    if len(lst) != len(fs):
-        print 'Lengths do not match: %r vs expected %r' % (
-            len(lst), len(fs))
-        return False
-    for fs_item, (expect_name, expect_value) in zip(fs.list, lst):
-        if fs_item.name != expect_name:
-            print "Names don't match: %r vs expected %r" % (
-                fs_item.name, expect_name)
-        if fs_item.value != expect_value:
-            print "Items don't match: %r vs expected %r" % (
-                fs_item.value, expect_value)
-            return False
-    return True
-
 def test_parsevars():
     e = make_post('a=1&b=2&c=3&b=4')
     cur_input = e['wsgi.input']
     d = parse_formvars(e)
     assert isinstance(d, MultiDict)
-    assert cmp_post(d, [('a', '1'), ('b', '2'), ('c', '3'), ('b', '4')])
+    assert d == MultiDict([('a', '1'), ('b', '2'), ('c', '3'), ('b', '4')])
     assert e['paste.parsed_formvars'] == (
         (d, e['wsgi.input']))
     assert e['wsgi.input'] is not cur_input