aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMatthew Shao <me@matshao.com>2017-08-03 18:53:08 +0800
committerMatthew Shao <me@matshao.com>2017-08-03 18:57:54 +0800
commitb42f5bcb9dd6a8d2609b8351f846a654a1fd65c2 (patch)
tree66ef2cdf61337ef710555cb80d609f08db5bb89f /test
parentddffcf83ecef8b6c81e5f23ff57ae17af6131219 (diff)
downloadmitmproxy-b42f5bcb9dd6a8d2609b8351f846a654a1fd65c2.tar.gz
mitmproxy-b42f5bcb9dd6a8d2609b8351f846a654a1fd65c2.tar.bz2
mitmproxy-b42f5bcb9dd6a8d2609b8351f846a654a1fd65c2.zip
Update taddon and tests.
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/addons/test_script.py6
-rw-r--r--test/mitmproxy/tools/console/test_statusbar.py3
2 files changed, 2 insertions, 7 deletions
diff --git a/test/mitmproxy/addons/test_script.py b/test/mitmproxy/addons/test_script.py
index 5b05aec8..64fd9505 100644
--- a/test/mitmproxy/addons/test_script.py
+++ b/test/mitmproxy/addons/test_script.py
@@ -260,9 +260,6 @@ class TestScriptLoader:
debug = [i.msg for i in tctx.master.logs if i.level == "debug"]
assert debug == [
- 'a load',
- 'b load',
- 'c load',
'c configure',
'a configure',
'b configure',
@@ -280,9 +277,6 @@ class TestScriptLoader:
debug = [i.msg for i in tctx.master.logs if i.level == "debug"]
assert debug == [
- 'c load',
- 'a load',
- 'b load',
'c done',
'b done',
'a configure',
diff --git a/test/mitmproxy/tools/console/test_statusbar.py b/test/mitmproxy/tools/console/test_statusbar.py
index 34981e42..0cb36c45 100644
--- a/test/mitmproxy/tools/console/test_statusbar.py
+++ b/test/mitmproxy/tools/console/test_statusbar.py
@@ -1,5 +1,5 @@
from mitmproxy import options
-from mitmproxy.tools.console import statusbar, master
+from mitmproxy.tools.console import statusbar, master, consoleaddons
def test_statusbar(monkeypatch):
@@ -25,6 +25,7 @@ def test_statusbar(monkeypatch):
save_stream_file="foo",
)
m = master.ConsoleMaster(o)
+ m.options.update(view_order='url', console_focus_follow=True)
monkeypatch.setattr(m.addons.get("clientplayback"), "count", lambda: 42)
monkeypatch.setattr(m.addons.get("serverplayback"), "count", lambda: 42)