diff options
| author | Aarni Koskela <akx@iki.fi> | 2022-02-10 18:37:09 +0200 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2022-03-21 08:05:54 -0700 |
| commit | c09621eb4269e9eaa2c5f386976f356fb0701236 (patch) | |
| tree | 3bf7e5e4240130a1d66fcfbf286707d418b2682a /test | |
| parent | 2636965f38a7788bbee19fc90088384834670b10 (diff) | |
| download | python-swiftclient-c09621eb4269e9eaa2c5f386976f356fb0701236.tar.gz | |
Don't patch Requests globally on import
This also upgrades the Requests dependency to 2.4+ (released in 2014)
to avoid having to do version comparisons altogether.
Refs https://bugs.launchpad.net/python-swiftclient/+bug/1904551
Signed-off-by: Aarni Koskela <akx@iki.fi>
Change-Id: I58399f6c526b0b78462f31739c43076314ba9e76
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/test_swiftclient.py | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/test/unit/test_swiftclient.py b/test/unit/test_swiftclient.py index f6dc258..6bdd6ad 100644 --- a/test/unit/test_swiftclient.py +++ b/test/unit/test_swiftclient.py @@ -1325,7 +1325,6 @@ class TestHeadObject(MockHttpTest): class TestPutObject(MockHttpTest): - @mock.patch('swiftclient.requests.__version__', '2.2.0') def test_ok(self): c.http_connection = self.fake_http_connection(200) args = ('http://www.test.com', 'TOKEN', 'container', 'obj', 'body', 4) @@ -1336,7 +1335,6 @@ class TestPutObject(MockHttpTest): ('PUT', '/container/obj', 'body', { 'x-auth-token': 'TOKEN', 'content-length': '4', - 'content-type': '' }), ]) @@ -1383,7 +1381,6 @@ class TestPutObject(MockHttpTest): self.assertEqual(len(w), 1) self.assertTrue(issubclass(w[-1].category, UserWarning)) - @mock.patch('swiftclient.requests.__version__', '2.2.0') def test_server_error(self): body = 'c' * 60 headers = {'foo': 'bar'} @@ -1398,8 +1395,7 @@ class TestPutObject(MockHttpTest): self.assertEqual(e.http_status, 500) self.assertRequests([ ('PUT', '/asdf/asdf', 'asdf', { - 'x-auth-token': 'asdf', - 'content-type': ''}), + 'x-auth-token': 'asdf'}), ]) def test_query_string(self): @@ -1540,19 +1536,7 @@ class TestPutObject(MockHttpTest): self.assertEqual(request_header['etag'], b'1234-5678') self.assertEqual(request_header['content-type'], b'text/plain') - @mock.patch('swiftclient.requests.__version__', '2.2.0') - def test_no_content_type_old_requests(self): - conn = c.http_connection(u'http://www.test.com/') - resp = MockHttpResponse(status=200) - conn[1].getresponse = resp.fake_response - conn[1]._request = resp._fake_request - - c.put_object(url='http://www.test.com', http_conn=conn) - request_header = resp.requests_params['headers'] - self.assertEqual(request_header['content-type'], b'') - - @mock.patch('swiftclient.requests.__version__', '2.4.0') - def test_no_content_type_new_requests(self): + def test_no_content_type_requests(self): conn = c.http_connection(u'http://www.test.com/') resp = MockHttpResponse(status=200) conn[1].getresponse = resp.fake_response |