diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-06-08 14:01:04 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-06-08 14:01:04 +1200 |
| commit | af22814bc34ab9521def8d190e555364b93dc8be (patch) | |
| tree | e4fd578d5575b875bfbebe7bf4889452e99e89b0 /test | |
| parent | 7dff8f0dca936a58070f6957ab84ca15aa10076a (diff) | |
| download | mitmproxy-af22814bc34ab9521def8d190e555364b93dc8be.tar.gz mitmproxy-af22814bc34ab9521def8d190e555364b93dc8be.tar.bz2 mitmproxy-af22814bc34ab9521def8d190e555364b93dc8be.zip | |
Revamp error logging somewhat
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_log.py | 4 | ||||
| -rw-r--r-- | test/test_pathoc.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/test_log.py b/test/test_log.py index 5473236e..9850654c 100644 --- a/test/test_log.py +++ b/test/test_log.py @@ -16,7 +16,7 @@ def test_disconnect(): rw = DummyIO() try: with log.Log(outf, False, rw, rw) as lg: - raise netlib.tcp.NetLibDisconnect() + lg("Test") except netlib.tcp.NetLibDisconnect: pass - assert "Disconnected" in outf.getvalue() + assert "Test" in outf.getvalue() diff --git a/test/test_pathoc.py b/test/test_pathoc.py index 556aada5..21e46e8c 100644 --- a/test/test_pathoc.py +++ b/test/test_pathoc.py @@ -145,7 +145,7 @@ class TestDaemon(_TestDaemon): assert "202" in self.tval(["get:'/p/202:b@1'"], ignorecodes=[200, 201]) def test_timeout(self): - assert "Timeout" in self.tval(["get:'/p/200:p0,10'"], timeout=0.01) + assert "Timeout" in self.tval(["get:'/p/200:p0,100'"], timeout=0.01) assert "HTTP" in self.tval( ["get:'/p/200:p5,100'"], showresp=True, |