diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2018-05-10 15:29:29 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2018-05-10 16:06:52 +1200 |
| commit | 8c63a8818d6e66c5b1e32e30d785d8d4a3bc233c (patch) | |
| tree | 340375b07b4ce7de5e4b4c2d0c98fa4d18edee21 /test | |
| parent | 9830e5b597ffbfae1781eb486c8cd8b0ba3c5dc7 (diff) | |
| download | mitmproxy-8c63a8818d6e66c5b1e32e30d785d8d4a3bc233c.tar.gz mitmproxy-8c63a8818d6e66c5b1e32e30d785d8d4a3bc233c.tar.bz2 mitmproxy-8c63a8818d6e66c5b1e32e30d785d8d4a3bc233c.zip | |
keymap: read keys from CONFDIR/keys.yaml by default
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/tools/console/test_keymap.py | 1 | ||||
| -rw-r--r-- | test/mitmproxy/utils/test_arg_check.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/mitmproxy/tools/console/test_keymap.py b/test/mitmproxy/tools/console/test_keymap.py index 901cd795..3e6f7c2e 100644 --- a/test/mitmproxy/tools/console/test_keymap.py +++ b/test/mitmproxy/tools/console/test_keymap.py @@ -78,6 +78,7 @@ def test_load_path(tmpdir): kmc = keymap.KeymapConfig() with taddons.context(kmc) as tctx: km = keymap.Keymap(tctx.master) + tctx.master.keymap = km with open(dst, 'wb') as f: f.write(b"\xff\xff\xff") diff --git a/test/mitmproxy/utils/test_arg_check.py b/test/mitmproxy/utils/test_arg_check.py index 0a5edd51..8ab14077 100644 --- a/test/mitmproxy/utils/test_arg_check.py +++ b/test/mitmproxy/utils/test_arg_check.py @@ -11,8 +11,8 @@ from mitmproxy.utils import arg_check (["-T"], "-T is deprecated, please use --mode transparent instead"), (["-U"], "-U is deprecated, please use --mode upstream:SPEC instead"), (["--confdir"], "--confdir is deprecated.\n" - "Please use `--set confdir=value` instead.\n" - "To show all options and their default values use --options"), + "Please use `--set confdir=value` instead.\n" + "To show all options and their default values use --options"), (["--palette"], "--palette is deprecated.\n" "Please use `--set console_palette=value` instead.\n" "To show all options and their default values use --options"), |