From 262caa90c8184e03ecb9aaf9f7f6eac4cc5efeb9 Mon Sep 17 00:00:00 2001 From: gholt Date: Fri, 10 Jun 2011 16:33:12 +0000 Subject: [PATCH] Merged from trunk --- test/unit/common/test_client.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/common/test_client.py b/test/unit/common/test_client.py index e6e1abb1dc..29d1e5ff5d 100644 --- a/test/unit/common/test_client.py +++ b/test/unit/common/test_client.py @@ -155,8 +155,8 @@ class MockHttpTest(unittest.TestCase): def fake_http_connection(*args, **kwargs): _orig_http_connection = c.http_connection - def wrapper(url): - parsed, _conn = _orig_http_connection(url) + def wrapper(url, proxy=None): + parsed, _conn = _orig_http_connection(url, proxy=proxy) conn = fake_http_connect(*args, **kwargs)() def request(*args, **kwargs): @@ -430,7 +430,7 @@ class TestConnection(MockHttpTest): def read(self, *args, **kwargs): return '' - def local_http_connection(url): + def local_http_connection(url, proxy=None): parsed = urlparse(url) return parsed, LocalConnection()