diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-04-10 14:08:30 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-04-10 14:08:30 +0000 |
commit | cdd8d33ea70745bf477aae1d5609e6ee7170820a (patch) | |
tree | 8263c743e227f37ea6cde8f304b77ad29a0ca904 | |
parent | e04bf9e093ea68d1a923d77080819738b6429d96 (diff) | |
parent | d8cb0b9b3224012b1933529fd3d6eded38cf713e (diff) | |
download | python-swiftclient-cdd8d33ea70745bf477aae1d5609e6ee7170820a.tar.gz |
Merge "Python 3: fix tests on HTTP headers"
-rw-r--r-- | tests/test_swiftclient.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/tests/test_swiftclient.py b/tests/test_swiftclient.py index 80f074c..f50dca3 100644 --- a/tests/test_swiftclient.py +++ b/tests/test_swiftclient.py @@ -175,7 +175,7 @@ class MockHttpResponse(): # This simulate previous httplib implementation that would do a # putrequest() and then use putheader() to send header. for k, v in kwarg['headers'].items(): - self.buffer.append('%s: %s' % (k, v)) + self.buffer.append((k, v)) return self.fake_response() @@ -633,7 +633,8 @@ class TestPutObject(MockHttpTest): u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91', u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91', mock_file) - headers = {'X-Header1': u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91', + text = u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91' + headers = {'X-Header1': text, 'X-2': 1, 'X-3': {'a': 'b'}, 'a-b': '.x:yz mn:fg:lp'} resp = MockHttpResponse() @@ -642,8 +643,11 @@ class TestPutObject(MockHttpTest): value = c.put_object(*args, headers=headers, http_conn=conn) self.assertTrue(isinstance(value, six.string_types)) # Test for RFC-2616 encoded symbols - self.assertTrue("a-b: .x:yz mn:fg:lp" in resp.buffer[0], - "[a-b: .x:yz mn:fg:lp] header is missing") + self.assertIn((b"a-b", b".x:yz mn:fg:lp"), + resp.buffer) + # Test unicode header + self.assertIn((b'x-header1', text.encode('utf8')), + resp.buffer) def test_chunk_warning(self): conn = c.http_connection('http://www.test.com/') @@ -694,7 +698,8 @@ class TestPostObject(MockHttpTest): '\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91', u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91', u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91') - headers = {'X-Header1': u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91', + text = u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91' + headers = {'X-Header1': text, 'X-2': '1', 'X-3': {'a': 'b'}, 'a-b': '.x:yz mn:kl:qr'} resp = MockHttpResponse() @@ -702,8 +707,10 @@ class TestPostObject(MockHttpTest): conn[1]._request = resp._fake_request c.post_object(*args, headers=headers, http_conn=conn) # Test for RFC-2616 encoded symbols - self.assertTrue("a-b: .x:yz mn:kl:qr" in resp.buffer[0], - "[a-b: .x:yz mn:kl:qr] header is missing") + self.assertTrue((b'a-b', b"a-b: .x:yz mn:kl:qr"), resp.buffer) + # Test unicode header + self.assertIn((b'x-header1', text.encode('utf8')), + resp.buffer) def test_server_error(self): body = 'c' * 60 |