1 files changed, 80 insertions, 60 deletions
diff --git a/test/test_connectionpool.py b/test/test_connectionpool.py
index c32c6dc..afc3098 100644
--- a/test/test_connectionpool.py
+++ b/test/test_connectionpool.py
@@ -1,30 +1,28 @@
 import unittest
 
 from urllib3.connectionpool import connection_from_url, HTTPConnectionPool
-from urllib3.util import get_host, make_headers
-from urllib3.exceptions import EmptyPoolError, LocationParseError
+from urllib3.packages.ssl_match_hostname import CertificateError
+from urllib3.exceptions import (
+    ClosedPoolError,
+    EmptyPoolError,
+    HostChangedError,
+    MaxRetryError,
+    SSLError,
+    TimeoutError,
+)
+
+from socket import timeout as SocketTimeout
+from ssl import SSLError as BaseSSLError
+
+try:   # Python 3
+    from queue import Empty
+    from http.client import HTTPException
+except ImportError:
+    from Queue import Empty
+    from httplib import HTTPException
 
 
 class TestConnectionPool(unittest.TestCase):
-    def test_get_host(self):
-        url_host_map = {
-            'http://google.com/mail': ('http', 'google.com', None),
-            'http://google.com/mail/': ('http', 'google.com', None),
-            'google.com/mail': ('http', 'google.com', None),
-            'http://google.com/': ('http', 'google.com', None),
-            'http://google.com': ('http', 'google.com', None),
-            'http://www.google.com': ('http', 'www.google.com', None),
-            'http://mail.google.com': ('http', 'mail.google.com', None),
-            'http://google.com:8000/mail/': ('http', 'google.com', 8000),
-            'http://google.com:8000': ('http', 'google.com', 8000),
-            'https://google.com': ('https', 'google.com', None),
-            'https://google.com:8000': ('https', 'google.com', 8000),
-            'http://user:password@127.0.0.1:1234': ('http', '127.0.0.1', 1234),
-        }
-        for url, expected_host in url_host_map.items():
-            returned_host = get_host(url)
-            self.assertEquals(returned_host, expected_host)
-
     def test_same_host(self):
         same_host = [
             ('http://google.com/', '/'),
@@ -50,45 +48,6 @@ class TestConnectionPool(unittest.TestCase):
             c = connection_from_url(a)
             self.assertFalse(c.is_same_host(b), "%s =? %s" % (a, b))
 
-    def test_invalid_host(self):
-        # TODO: Add more tests
-        invalid_host = [
-            'http://google.com:foo',
-        ]
-
-        for location in invalid_host:
-            self.assertRaises(LocationParseError, get_host, location)
-
-
-    def test_make_headers(self):
-        self.assertEqual(
-            make_headers(accept_encoding=True),
-            {'accept-encoding': 'gzip,deflate'})
-
-        self.assertEqual(
-            make_headers(accept_encoding='foo,bar'),
-            {'accept-encoding': 'foo,bar'})
-
-        self.assertEqual(
-            make_headers(accept_encoding=['foo', 'bar']),
-            {'accept-encoding': 'foo,bar'})
-
-        self.assertEqual(
-            make_headers(accept_encoding=True, user_agent='banana'),
-            {'accept-encoding': 'gzip,deflate', 'user-agent': 'banana'})
-
-        self.assertEqual(
-            make_headers(user_agent='banana'),
-            {'user-agent': 'banana'})
-
-        self.assertEqual(
-            make_headers(keep_alive=True),
-            {'connection': 'keep-alive'})
-
-        self.assertEqual(
-            make_headers(basic_auth='foo:bar'),
-            {'authorization': 'Basic Zm9vOmJhcg=='})
-
     def test_max_connections(self):
         pool = HTTPConnectionPool(host='localhost', maxsize=1, block=True)
 
@@ -127,6 +86,67 @@ class TestConnectionPool(unittest.TestCase):
             str(EmptyPoolError(HTTPConnectionPool(host='localhost'), "Test.")),
             "HTTPConnectionPool(host='localhost', port=None): Test.")
 
+    def test_pool_size(self):
+        POOL_SIZE = 1
+        pool = HTTPConnectionPool(host='localhost', maxsize=POOL_SIZE, block=True)
+
+        def _raise(ex):
+            raise ex()
+
+        def _test(exception, expect):
+            pool._make_request = lambda *args, **kwargs: _raise(exception)
+            with self.assertRaises(expect):
+                pool.request('GET', '/')
+
+            self.assertEqual(pool.pool.qsize(), POOL_SIZE)
+
+        #make sure that all of the exceptions return the connection to the pool
+        _test(Empty, TimeoutError)
+        _test(SocketTimeout, TimeoutError)
+        _test(BaseSSLError, SSLError)
+        _test(CertificateError, SSLError)
+
+        # The pool should never be empty, and with these two exceptions being raised,
+        # a retry will be triggered, but that retry will fail, eventually raising
+        # MaxRetryError, not EmptyPoolError
+        # See: https://github.com/shazow/urllib3/issues/76
+        pool._make_request = lambda *args, **kwargs: _raise(HTTPException)
+        with self.assertRaises(MaxRetryError):
+            pool.request('GET', '/', retries=1, pool_timeout=0.01)
+        self.assertEqual(pool.pool.qsize(), POOL_SIZE)
+
+    def test_assert_same_host(self):
+        c = connection_from_url('http://google.com:80')
+
+        with self.assertRaises(HostChangedError):
+            c.request('GET', 'http://yahoo.com:80', assert_same_host=True)
+
+    def test_pool_close(self):
+        pool = connection_from_url('http://google.com:80')
+
+        # Populate with some connections
+        conn1 = pool._get_conn()
+        conn2 = pool._get_conn()
+        conn3 = pool._get_conn()
+        pool._put_conn(conn1)
+        pool._put_conn(conn2)
+
+        old_pool_queue = pool.pool
+
+        pool.close()
+        self.assertEqual(pool.pool, None)
+
+        with self.assertRaises(ClosedPoolError):
+            pool._get_conn()
+
+        pool._put_conn(conn3)
+
+        with self.assertRaises(ClosedPoolError):
+            pool._get_conn()
+
+        with self.assertRaises(Empty):
+            old_pool_queue.get(block=False)
+
 
 if __name__ == '__main__':
     unittest.main()