diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_console_contentview.py | 12 | ||||
| -rw-r--r-- | test/test_dump.py | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/test/test_console_contentview.py b/test/test_console_contentview.py index 0aabd2c5..abc762fa 100644 --- a/test/test_console_contentview.py +++ b/test/test_console_contentview.py @@ -190,7 +190,7 @@ Larry [["content-type", "application/json"]], "[1, 2, 3]", 1000, - lambda x: None + lambda x, l: None ) assert "Raw" in r[0] @@ -199,7 +199,7 @@ Larry [["content-type", "application/json"]], "[1, 2, 3]", 1000, - lambda x: None + lambda x, l: None ) assert r[0] == "JSON" @@ -208,7 +208,7 @@ Larry [["content-type", "application/json"]], "[1, 2", 1000, - lambda x: None + lambda x, l: None ) assert "Raw" in r[0] @@ -217,7 +217,7 @@ Larry [], "[1, 2", 1000, - lambda x: None + lambda x, l: None ) assert "Raw" in r[0] @@ -230,7 +230,7 @@ Larry ], encoding.encode('gzip', "[1, 2, 3]"), 1000, - lambda x: None + lambda x, l: None ) assert "decoded gzip" in r[0] assert "JSON" in r[0] @@ -243,7 +243,7 @@ Larry ], encoding.encode('gzip', "[1, 2, 3]"), 1000, - lambda x: None + lambda x, l: None ) assert "decoded gzip" in r[0] assert "Raw" in r[0] 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 |