diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-18 17:19:44 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-18 17:19:44 +0100 |
| commit | ce38a17893791944fb8b4f589e7ce00d79b8ced0 (patch) | |
| tree | a26c992e1011cab0558efa389dee561bcf694d62 /test/test_dump.py | |
| parent | c07cd857a76db5a4d9dbfe46abc84bb6c20088f1 (diff) | |
| parent | 843b2e28bc4fcadb854b4b50c2f56a67bf63866a (diff) | |
| download | mitmproxy-ce38a17893791944fb8b4f589e7ce00d79b8ced0.tar.gz mitmproxy-ce38a17893791944fb8b4f589e7ce00d79b8ced0.tar.bz2 mitmproxy-ce38a17893791944fb8b4f589e7ce00d79b8ced0.zip | |
Merge pull request #238 from mitmproxy/log_levels
Log Levels
Diffstat (limited to 'test/test_dump.py')
| -rw-r--r-- | test/test_dump.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test_dump.py b/test/test_dump.py index 0f7d9bea..604bc542 100644 --- a/test/test_dump.py +++ b/test/test_dump.py @@ -56,7 +56,7 @@ class TestDumpMaster: def test_error(self): cs = StringIO() - o = dump.Options(verbosity=1) + o = dump.Options(flow_detail=1) m = dump.DumpMaster(None, o, None, outfile=cs) f = tutils.tflow_err() m.handle_request(f.request) @@ -90,7 +90,7 @@ class TestDumpMaster: with tutils.tmpdir() as t: p = os.path.join(t, "read") self._flowfile(p) - assert "GET" in self._dummy_cycle(0, None, "", verbosity=1, rfile=p) + assert "GET" in self._dummy_cycle(0, None, "", flow_detail=1, rfile=p) tutils.raises( dump.DumpError, self._dummy_cycle, @@ -127,9 +127,9 @@ class TestDumpMaster: def test_basic(self): for i in (1, 2, 3): - assert "GET" in self._dummy_cycle(1, "~s", "", verbosity=i, eventlog=True) - assert "GET" in self._dummy_cycle(1, "~s", "\x00\x00\x00", verbosity=i) - assert "GET" in self._dummy_cycle(1, "~s", "ascii", verbosity=i) + assert "GET" in self._dummy_cycle(1, "~s", "", flow_detail=i) + assert "GET" in self._dummy_cycle(1, "~s", "\x00\x00\x00", flow_detail=i) + assert "GET" in self._dummy_cycle(1, "~s", "ascii", flow_detail=i) def test_write(self): with tutils.tmpdir() as d: @@ -150,7 +150,7 @@ class TestDumpMaster: def test_script(self): ret = self._dummy_cycle( 1, None, "", - scripts=[tutils.test_data.path("scripts/all.py")], verbosity=0, eventlog=True + scripts=[tutils.test_data.path("scripts/all.py")], verbosity=1 ) assert "XCLIENTCONNECT" in ret assert "XSERVERCONNECT" in ret |