openstack/swift
Code Issues Proposed changes

Merged from trunk

Browse Source
This commit is contained in:
gholt
2011-06-10 16:33:12 +00:00
parent 8c191aebab
commit 262caa90c8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/unit/common/test_client.py
View File

@@ -155,8 +155,8 @@ class MockHttpTest(unittest.TestCase):
def fake_http_connection(*args, **kwargs): def fake_http_connection(*args, **kwargs):
_orig_http_connection = c.http_connection _orig_http_connection = c.http_connection
def wrapper(url): def wrapper(url, proxy=None):
parsed, _conn = _orig_http_connection(url) parsed, _conn = _orig_http_connection(url, proxy=proxy)
conn = fake_http_connect(*args, **kwargs)() conn = fake_http_connect(*args, **kwargs)()
def request(*args, **kwargs): def request(*args, **kwargs):
@@ -430,7 +430,7 @@ class TestConnection(MockHttpTest):
def read(self, *args, **kwargs): def read(self, *args, **kwargs):
return '' return ''
def local_http_connection(url): def local_http_connection(url, proxy=None):
parsed = urlparse(url) parsed = urlparse(url)
return parsed, LocalConnection() return parsed, LocalConnection()