diff options
| author | Rouli <rouli.net@gmail.com> | 2013-02-28 13:28:57 +0200 |
|---|---|---|
| committer | Rouli <rouli.net@gmail.com> | 2013-02-28 13:28:57 +0200 |
| commit | b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924 (patch) | |
| tree | a939022f9bbafea95d1d2e88e141b6cceefebdd2 /test/test_proxy.py | |
| parent | 35f36481b9f9a8050e0316600be168316b60d05e (diff) | |
| parent | b077189dd5230b6c440a200d867c70c6ce031b66 (diff) | |
| download | mitmproxy-b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924.tar.gz mitmproxy-b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924.tar.bz2 mitmproxy-b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'test/test_proxy.py')
| -rw-r--r-- | test/test_proxy.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/test_proxy.py b/test/test_proxy.py index c73f61d8..3995b393 100644 --- a/test/test_proxy.py +++ b/test/test_proxy.py @@ -1,7 +1,7 @@ from libmproxy import proxy, flow import tutils from libpathod import test -from netlib import http +from netlib import http, tcp import mock @@ -39,8 +39,8 @@ class TestServerConnection: self.d.shutdown() def test_simple(self): - sc = proxy.ServerConnection(proxy.ProxyConfig(), self.d.IFACE, self.d.port) - sc.connect("http") + sc = proxy.ServerConnection(proxy.ProxyConfig(), "http", self.d.IFACE, self.d.port, "host.com") + sc.connect() r = tutils.treq() r.path = "/p/200:da" sc.send(r) @@ -53,8 +53,9 @@ class TestServerConnection: sc.terminate() def test_terminate_error(self): - sc = proxy.ServerConnection(proxy.ProxyConfig(), self.d.IFACE, self.d.port) - sc.connect("http") + sc = proxy.ServerConnection(proxy.ProxyConfig(), "http", self.d.IFACE, self.d.port, "host.com") + sc.connect() sc.connection = mock.Mock() sc.connection.close = mock.Mock(side_effect=IOError) sc.terminate() + |