Imported Upstream version 1.7.1

1 files changed, 17 insertions, 1 deletions

diff --git a/test/test_proxymanager.py b/test/test_proxymanager.py
index 64c86e8..e7b5c48 100644
--- a/test/test_proxymanager.py
+++ b/test/test_proxymanager.py
@@ -5,7 +5,7 @@ from urllib3.poolmanager import ProxyManager
 
 class TestProxyManager(unittest.TestCase):
     def test_proxy_headers(self):
-        p = ProxyManager(None)
+        p = ProxyManager('http://something:1234')
         url = 'http://pypi.python.org/test'
 
         # Verify default headers
@@ -23,5 +23,21 @@ class TestProxyManager(unittest.TestCase):
 
         self.assertEqual(headers, provided_headers)
 
+        # Verify proxy with nonstandard port
+        provided_headers = {'Accept': 'application/json'}
+        expected_headers = provided_headers.copy()
+        expected_headers.update({'Host': 'pypi.python.org:8080'})
+        url_with_port = 'http://pypi.python.org:8080/test'
+        headers = p._set_proxy_headers(url_with_port, provided_headers)
+
+        self.assertEqual(headers, expected_headers)
+
+    def test_default_port(self):
+        p = ProxyManager('http://something')
+        self.assertEqual(p.proxy.port, 80)
+        p = ProxyManager('https://something')
+        self.assertEqual(p.proxy.port, 443)
+
+
 if __name__ == '__main__':
     unittest.main()