openstack/swift
Code Issues Proposed changes

Fix to unit test (that has been broken for a while I guess)

Browse Source
This commit is contained in:
gholt
2010-10-12 13:36:19 -07:00
parent 3db727bf1c
commit 5d450b5f6d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/unit/proxy/test_server.py
View File

@@ -1326,8 +1326,10 @@ class TestObjectController(unittest.TestCase):
exp = 'HTTP/1.1 405' exp = 'HTTP/1.1 405'
self.assertEquals(headers[:len(exp)], exp) self.assertEquals(headers[:len(exp)], exp)
# Check unhandled exception # Check unhandled exception
orig_logger = prosrv.logger orig_update_request = prosrv.update_request
del prosrv.logger def broken_update_request(env, req):
raise Exception('fake')
prosrv.update_request = broken_update_request
sock = connect_tcp(('localhost', prolis.getsockname()[1])) sock = connect_tcp(('localhost', prolis.getsockname()[1]))
fd = sock.makefile() fd = sock.makefile()
fd.write('HEAD /v1/a HTTP/1.1\r\nHost: localhost\r\n' fd.write('HEAD /v1/a HTTP/1.1\r\nHost: localhost\r\n'
@@ -1337,7 +1339,7 @@ class TestObjectController(unittest.TestCase):
headers = readuntil2crlfs(fd) headers = readuntil2crlfs(fd)
exp = 'HTTP/1.1 500' exp = 'HTTP/1.1 500'
self.assertEquals(headers[:len(exp)], exp) self.assertEquals(headers[:len(exp)], exp)
prosrv.logger = orig_logger prosrv.update_request = orig_update_request
# Okay, back to chunked put testing; Create account # Okay, back to chunked put testing; Create account
ts = normalize_timestamp(time()) ts = normalize_timestamp(time())
partition, nodes = prosrv.account_ring.get_nodes('a') partition, nodes = prosrv.account_ring.get_nodes('a')