Merge "Close connections created when calling module-level functions"

2 files changed, 5 insertions, 2 deletions

diff --git a/test/unit/test_swiftclient.py b/test/unit/test_swiftclient.py
index 2644e33..ea5f502 100644
--- a/test/unit/test_swiftclient.py
+++ b/test/unit/test_swiftclient.py
@@ -802,6 +802,7 @@ class TestHeadAccount(MockHttpTest):
         self.assertRequests([
             ('HEAD', 'http://www.tests.com', '', {'x-auth-token': 'asdf'})
         ])
+        self.assertTrue(self.request_log[-1][-1]._closed)
 
     def test_server_error(self):
         body = 'c' * 65
diff --git a/test/unit/utils.py b/test/unit/utils.py
index 025a234..3190e9d 100644
--- a/test/unit/utils.py
+++ b/test/unit/utils.py
@@ -109,6 +109,7 @@ def fake_http_connect(*code_iter, **kwargs):
             self.timestamp = timestamp
             self.headers = headers or {}
             self.request = None
+            self._closed = False
 
         def getresponse(self):
             if kwargs.get('raise_exc'):
@@ -167,7 +168,7 @@ def fake_http_connect(*code_iter, **kwargs):
             return dict(self.getheaders()).get(name.lower(), default)
 
         def close(self):
-            pass
+            self._closed = True
 
     timestamps_iter = iter(kwargs.get('timestamps') or ['1'] * len(code_iter))
     etag_iter = iter(kwargs.get('etags') or [None] * len(code_iter))
@@ -248,7 +249,8 @@ class MockHttpTest(unittest.TestCase):
 
                 class RequestsWrapper(object):
                     def close(self):
-                        pass
+                        if hasattr(self, 'resp'):
+                            self.resp.close()
                 conn = RequestsWrapper()
 
                 def request(method, path, *args, **kwargs):