openstack/python-swiftclient
Code Issues Proposed changes

Merge "Python 3: fix tests on HTTP headers"

Browse Source
This commit is contained in:
Jenkins 2014-04-10 14:08:30 +00:00 committed by Gerrit Code Review
commit cdd8d33ea7
1 changed files with 14 additions and 7 deletions

21
tests/test_swiftclient.py

@ -175,7 +175,7 @@ class MockHttpResponse():
# This simulate previous httplib implementation that would do a # This simulate previous httplib implementation that would do a
# putrequest() and then use putheader() to send header. # putrequest() and then use putheader() to send header.
for k, v in kwarg['headers'].items(): for k, v in kwarg['headers'].items():
self.buffer.append('%s: %s' % (k, v)) self.buffer.append((k, v))
return self.fake_response() 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',
u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91', u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91',
mock_file) 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'} 'X-2': 1, 'X-3': {'a': 'b'}, 'a-b': '.x:yz mn:fg:lp'}
resp = MockHttpResponse() resp = MockHttpResponse()
@ -642,8 +643,11 @@ class TestPutObject(MockHttpTest):
value = c.put_object(*args, headers=headers, http_conn=conn) value = c.put_object(*args, headers=headers, http_conn=conn)
self.assertTrue(isinstance(value, six.string_types)) self.assertTrue(isinstance(value, six.string_types))
# Test for RFC-2616 encoded symbols # Test for RFC-2616 encoded symbols
self.assertTrue("a-b: .x:yz mn:fg:lp" in resp.buffer[0], self.assertIn((b"a-b", b".x:yz mn:fg:lp"),
"[a-b: .x:yz mn:fg:lp] header is missing") resp.buffer)
# Test unicode header
self.assertIn((b'x-header1', text.encode('utf8')),
resp.buffer)
def test_chunk_warning(self): def test_chunk_warning(self):
conn = c.http_connection('http://www.test.com/') conn = c.http_connection('http://www.test.com/')
@ -694,7 +698,8 @@ class TestPostObject(MockHttpTest):
'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91', '\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91',
u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91', u'\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'} 'X-2': '1', 'X-3': {'a': 'b'}, 'a-b': '.x:yz mn:kl:qr'}
resp = MockHttpResponse() resp = MockHttpResponse()
@ -702,8 +707,10 @@ class TestPostObject(MockHttpTest):
conn[1]._request = resp._fake_request conn[1]._request = resp._fake_request
c.post_object(*args, headers=headers, http_conn=conn) c.post_object(*args, headers=headers, http_conn=conn)
# Test for RFC-2616 encoded symbols # Test for RFC-2616 encoded symbols
self.assertTrue("a-b: .x:yz mn:kl:qr" in resp.buffer[0], self.assertTrue((b'a-b', b"a-b: .x:yz mn:kl:qr"), resp.buffer)
"[a-b: .x:yz mn:kl:qr] header is missing") # Test unicode header
self.assertIn((b'x-header1', text.encode('utf8')),
resp.buffer)
def test_server_error(self): def test_server_error(self):
body = 'c' * 60 body = 'c' * 60