From af54c260143f378bc71e3eba836544a59e9a2736 Mon Sep 17 00:00:00 2001 From: madt1m Date: Wed, 13 Jun 2018 17:39:46 +0200 Subject: fixed exception type; full coverage on view --- mitmproxy/addons/view.py | 2 +- test/mitmproxy/addons/test_view.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mitmproxy/addons/view.py b/mitmproxy/addons/view.py index 4c189552..1c8bd0ce 100644 --- a/mitmproxy/addons/view.py +++ b/mitmproxy/addons/view.py @@ -300,7 +300,7 @@ class View(collections.Sequence): if f: filt = flowfilter.parse(f) if not filt: - raise exceptions.OptionsError( + raise exceptions.CommandError( "Invalid interception filter: %s" % f ) self.set_filter(filt) diff --git a/test/mitmproxy/addons/test_view.py b/test/mitmproxy/addons/test_view.py index e840eac6..976c14b7 100644 --- a/test/mitmproxy/addons/test_view.py +++ b/test/mitmproxy/addons/test_view.py @@ -123,6 +123,9 @@ def test_filter(): v.toggle_marked() assert len(v) == 4 + with pytest.raises(exceptions.CommandError): + v.set_filter_cmd("~notafilter regex") + v[1].marked = True v.toggle_marked() assert len(v) == 1 @@ -320,6 +323,8 @@ def test_order(): v.set_reversed(False) assert [i.request.timestamp_start for i in v] == [1, 2, 3, 4] + with pytest.raises(exceptions.CommandError): + v.set_order("not_an_order") def test_reversed(): -- cgit v1.2.3