diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
| commit | 080e4534253338c94e6d8c86cb3679ff15410f85 (patch) | |
| tree | 6322fb822332b4135f0ff14de8c2d7137016f734 /test/test_console_help.py | |
| parent | db5c0b210b0133d7cd58124c727dbc24480e2568 (diff) | |
| parent | 074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff) | |
| download | mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2 mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip | |
Merge branch 'master' into hardfailvenv
Conflicts:
dev
Diffstat (limited to 'test/test_console_help.py')
| -rw-r--r-- | test/test_console_help.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/test_console_help.py b/test/test_console_help.py index a410bd2e..a7a8b745 100644 --- a/test/test_console_help.py +++ b/test/test_console_help.py @@ -5,10 +5,12 @@ if os.name == "nt": import libmproxy.console.help as help + class DummyLoop: def __init__(self): self.widget = None + class DummyMaster: def __init__(self): self.loop = DummyLoop() @@ -19,12 +21,12 @@ class DummyMaster: class TestHelp: def test_helptext(self): - h = help.HelpView(None, "foo", None) + h = help.HelpView(None) assert h.helptext() def test_keypress(self): master = DummyMaster() - h = help.HelpView(master, "foo", [1, 2, 3]) + h = help.HelpView([1, 2, 3]) assert not h.keypress((0, 0), "q") assert not h.keypress((0, 0), "?") assert h.keypress((0, 0), "o") == "o" |