[Python-checkins] distutils2: Update Konrad's tests to use the new mocked PyPIServer (without wsgiref)

[tarek.ziade]

tarek.ziade pushed 0909012bba0a to distutils2:

http://hg.python.org/distutils2/rev/0909012bba0a
changeset:   300:0909012bba0a
user:        Alexis Metaireau <ametaireau at gmail.com>
date:        Thu Jun 03 18:07:03 2010 +0200
summary:     Update Konrad's tests to use the new mocked PyPIServer (without wsgiref)
files:       src/distutils2/tests/pypi_server.py, src/distutils2/tests/test_upload.py, src/distutils2/tests/test_upload_docs.py

diff --git a/src/distutils2/tests/pypi_server.py b/src/distutils2/tests/pypi_server.py
--- a/src/distutils2/tests/pypi_server.py
+++ b/src/distutils2/tests/pypi_server.py
@@ -67,6 +67,8 @@
         self.default_response_status = 200
         self.default_response_headers = [('Content-type', 'text/plain')]
         self.default_response_data = "hello"
+        
+        # initialize static paths / filesystems
         self.static_uri_paths = static_uri_paths
         if test_static_path is not None:
             static_filesystem_paths.append(test_static_path)
diff --git a/src/distutils2/tests/test_upload.py b/src/distutils2/tests/test_upload.py
--- a/src/distutils2/tests/test_upload.py
+++ b/src/distutils2/tests/test_upload.py
@@ -63,13 +63,14 @@
         cmd.run()
 
         # what did we send ?
-        environ, request_data = self.pypi.requests[-1]
+        handler, request_data = self.pypi.requests[-1]
+        headers = handler.headers.dict
         self.assertIn('dédé', request_data)
         self.assertIn('xxx', request_data)
-        self.assert_(environ['CONTENT_LENGTH'] > 2000)
-        self.assertTrue(environ['CONTENT_TYPE'].startswith('multipart/form-data'))
-        self.assertEqual(environ['REQUEST_METHOD'], 'POST')
-        self.assertNotIn('\n', environ['HTTP_AUTHORIZATION'])
+        self.assert_(headers['content-length'] > 2000)
+        self.assertTrue(headers['content-type'].startswith('multipart/form-data'))
+        self.assertEqual(handler.command, 'POST')
+        self.assertNotIn('\n', headers['authorization'])
 
 def test_suite():
     return unittest2.makeSuite(UploadTestCase)
diff --git a/src/distutils2/tests/test_upload_docs.py b/src/distutils2/tests/test_upload_docs.py
--- a/src/distutils2/tests/test_upload_docs.py
+++ b/src/distutils2/tests/test_upload_docs.py
@@ -100,11 +100,11 @@
         self.cmd.run()
 
         self.assertEqual(len(self.pypi.requests), 1)
-        environ, request_data = self.pypi.requests[-1]
-
+        handler, request_data = self.pypi.requests[-1]
         self.assertIn("content", request_data)
-        self.assertIn("Basic", environ['HTTP_AUTHORIZATION'])
-        self.assertTrue(environ['CONTENT_TYPE'].startswith('multipart/form-data;'))
+        self.assertIn("Basic", handler.headers.dict['authorization'])
+        self.assertTrue(handler.headers.dict['content-type']
+            .startswith('multipart/form-data;'))
 
         action, name, content =\
             request_data.split("----------------GHSKFJDLGDS7543FJKLFHRE75642756743254")[1:4]
@@ -188,7 +188,7 @@
         finally:
             sys.stdout = orig_stdout
         self.assertTrue(write_args[0], "should report the response")
-        self.assertIn("\n".join(self.pypi.default_response_data), write_args[0])
+        self.assertIn(self.pypi.default_response_data + "\n", write_args[0])
 
 def test_suite():
     return unittest2.makeSuite(UploadDocsTestCase)

--
Repository URL: http://hg.python.org/distutils2