diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-01-09 18:06:12 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-01-09 18:06:12 +0100 |
| commit | f83508d4bf313710de8afa204aaf9be227cf812c (patch) | |
| tree | f3575eb86f8649537ce27ac6c03587876061e4ff /test/test_pathoc.py | |
| parent | d31b7daf6c284f13b733bc9f8076ab836f8f464e (diff) | |
| parent | 53e9b37675c3d4558405a4581ac96a8a43c4a82d (diff) | |
| download | mitmproxy-f83508d4bf313710de8afa204aaf9be227cf812c.tar.gz mitmproxy-f83508d4bf313710de8afa204aaf9be227cf812c.tar.bz2 mitmproxy-f83508d4bf313710de8afa204aaf9be227cf812c.zip | |
Merge branch 'master' into tcp_proxy
Diffstat (limited to 'test/test_pathoc.py')
| -rw-r--r-- | test/test_pathoc.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test_pathoc.py b/test/test_pathoc.py index 31d73111..7493b2e7 100644 --- a/test/test_pathoc.py +++ b/test/test_pathoc.py @@ -136,16 +136,16 @@ class TestDaemon(_TestDaemon): def test_connect_fail(self): to = ("foobar", 80) c = pathoc.Pathoc("127.0.0.1", self.d.port) - r, w = cStringIO.StringIO(), cStringIO.StringIO() - tutils.raises("connect failed", c.http_connect, to, w, r) - r = cStringIO.StringIO( + c.rfile, c.wfile = cStringIO.StringIO(), cStringIO.StringIO() + tutils.raises("connect failed", c.http_connect, to) + c.rfile = cStringIO.StringIO( "HTTP/1.1 500 OK\r\n" ) - tutils.raises("connect failed", c.http_connect, to, w, r) - r = cStringIO.StringIO( + tutils.raises("connect failed", c.http_connect, to) + c.rfile = cStringIO.StringIO( "HTTP/1.1 200 OK\r\n" ) - c.http_connect(to, w, r) + c.http_connect(to) |