aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-10-30 18:10:04 +1300
committerGitHub <noreply@github.com>2016-10-30 18:10:04 +1300
commitf168379c2ac4610d370729dce190ffba43846943 (patch)
treeca53461260c0b78725e9295b80e5fb0fee1a8bf1 /test
parent897d5ddc87c2a30a6740b32217959e8bbce690cc (diff)
parentf08b57fb9bd03f2abf1a4f11d0d01ffc50e3582c (diff)
downloadmitmproxy-f168379c2ac4610d370729dce190ffba43846943.tar.gz
mitmproxy-f168379c2ac4610d370729dce190ffba43846943.tar.bz2
mitmproxy-f168379c2ac4610d370729dce190ffba43846943.zip
Merge pull request #1692 from cortesi/floworder
console: o for flow order
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/addons/test_view.py21
1 files changed, 17 insertions, 4 deletions
diff --git a/test/mitmproxy/addons/test_view.py b/test/mitmproxy/addons/test_view.py
index c7a9821a..750e8469 100644
--- a/test/mitmproxy/addons/test_view.py
+++ b/test/mitmproxy/addons/test_view.py
@@ -77,13 +77,13 @@ def test_order():
v.set_order(view.key_request_method)
assert [i.request.method for i in v] == ["GET", "GET", "PUT", "PUT"]
- v.toggle_reversed()
+ v.set_reversed(True)
assert [i.request.method for i in v] == ["PUT", "PUT", "GET", "GET"]
v.set_order(view.key_request_start)
assert [i.request.timestamp_start for i in v] == [4, 3, 2, 1]
- v.toggle_reversed()
+ v.set_reversed(False)
assert [i.request.timestamp_start for i in v] == [1, 2, 3, 4]
@@ -92,7 +92,7 @@ def test_reversed():
v.request(tft(start=1))
v.request(tft(start=2))
v.request(tft(start=3))
- v.toggle_reversed()
+ v.set_reversed(True)
assert v[0].request.timestamp_start == 3
assert v[-1].request.timestamp_start == 1
@@ -266,8 +266,16 @@ def test_settings():
class Options(options.Options):
- def __init__(self, *, filter=None, **kwargs):
+ def __init__(
+ self, *,
+ filter=None,
+ order=None,
+ order_reversed=False,
+ **kwargs
+ ):
self.filter = filter
+ self.order = order
+ self.order_reversed = order_reversed
super().__init__(**kwargs)
@@ -276,3 +284,8 @@ def test_configure():
with taddons.context(options=Options()) as tctx:
tctx.configure(v, filter="~q")
tutils.raises("invalid interception filter", tctx.configure, v, filter="~~")
+
+ tctx.configure(v, order="method")
+ tutils.raises("unknown flow order", tctx.configure, v, order="no")
+
+ tctx.configure(v, order_reversed=True)