diff options
| author | Tim Burke <tim.burke@gmail.com> | 2020-04-18 22:41:55 -0700 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2020-10-13 10:45:07 -0700 |
| commit | 97aa3e65412ee241fce7721927b0b003daf51ed4 (patch) | |
| tree | 5e9a960b611b2fdaaf1383ab2b7a00965544ebfe /test | |
| parent | b13712949fd58ba1332cb0507dd39853c0ee0efe (diff) | |
| download | python-swiftclient-97aa3e65412ee241fce7721927b0b003daf51ed4.tar.gz | |
Close connections created when calling module-level functions
Co-Authored-By: Clay Gerrard <clay.gerrard@gmail.com>
Change-Id: Id62e63afc6f2ffa32eb8640787c78559481050f9
Related-Change: I200ad0cdc8b7999c3f5521b9a822122bd18714bf
Related-Bug: #1873435
Closes-Bug: #1838775
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/test_swiftclient.py | 1 | ||||
| -rw-r--r-- | test/unit/utils.py | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/test/unit/test_swiftclient.py b/test/unit/test_swiftclient.py index dfd79c7..bfeb61b 100644 --- a/test/unit/test_swiftclient.py +++ b/test/unit/test_swiftclient.py @@ -785,6 +785,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): |