From aefb30ea60255166a4d6b3da8e669a4e89485f6e Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 12 Mar 2014 22:13:00 +0100 Subject: restrict -e to mitmproxy only (not mitmdump) --- test/test_dump.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/test_dump.py') diff --git a/test/test_dump.py b/test/test_dump.py index 0f7d9bea..b723c3e0 100644 --- a/test/test_dump.py +++ b/test/test_dump.py @@ -127,7 +127,7 @@ 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", "", verbosity=i) assert "GET" in self._dummy_cycle(1, "~s", "\x00\x00\x00", verbosity=i) assert "GET" in self._dummy_cycle(1, "~s", "ascii", verbosity=i) @@ -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=0 ) assert "XCLIENTCONNECT" in ret assert "XSERVERCONNECT" in ret -- cgit v1.2.3 From 1bfc1646924d18f2f13ba71b179480963e11dee9 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 13 Mar 2014 01:22:12 +0100 Subject: adjust tests, fix option handling --- test/test_dump.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test/test_dump.py') diff --git a/test/test_dump.py b/test/test_dump.py index b723c3e0..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) - 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 + scripts=[tutils.test_data.path("scripts/all.py")], verbosity=1 ) assert "XCLIENTCONNECT" in ret assert "XSERVERCONNECT" in ret -- cgit v1.2.3