diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
| commit | b51363b3ca43f6572acb673186e6ae78a1f48434 (patch) | |
| tree | a7488b32871c142141a813dc6ff2ede172672c31 /test/test_dump.py | |
| parent | 4fe2c069cca07aadf983f54e18dac4de492d5d69 (diff) | |
| parent | 06fba18106a8f759ec6f08453e86772a170c653b (diff) | |
| download | mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.gz mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.bz2 mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.zip | |
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
Conflicts:
examples/har_extractor.py
examples/nonblocking.py
examples/read_dumpfile
libmproxy/web/app.py
Diffstat (limited to 'test/test_dump.py')
| -rw-r--r-- | test/test_dump.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/test/test_dump.py b/test/test_dump.py index 48eeb244..e3743ac6 100644 --- a/test/test_dump.py +++ b/test/test_dump.py @@ -116,7 +116,6 @@ class TestDumpMaster: 0, None, "", verbosity=1, rfile="test_dump.py" ) - def test_options(self): o = dump.Options(verbosity = 2) assert o.verbosity == 2 @@ -147,21 +146,25 @@ class TestDumpMaster: def test_basic(self): for i in (1, 2, 3): 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", + "\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: p = os.path.join(d, "a") - self._dummy_cycle(1, None, "", outfile=(p,"wb"), verbosity=0) - assert len(list(flow.FlowReader(open(p,"rb")).stream())) == 1 + self._dummy_cycle(1, None, "", outfile=(p, "wb"), verbosity=0) + assert len(list(flow.FlowReader(open(p, "rb")).stream())) == 1 def test_write_append(self): with tutils.tmpdir() as d: p = os.path.join(d, "a.append") - self._dummy_cycle(1, None, "", outfile=(p,"wb"), verbosity=0) - self._dummy_cycle(1, None, "", outfile=(p,"ab"), verbosity=0) - assert len(list(flow.FlowReader(open(p,"rb")).stream())) == 2 + self._dummy_cycle(1, None, "", outfile=(p, "wb"), verbosity=0) + self._dummy_cycle(1, None, "", outfile=(p, "ab"), verbosity=0) + assert len(list(flow.FlowReader(open(p, "rb")).stream())) == 2 def test_write_err(self): tutils.raises( |