From 8c63a8818d6e66c5b1e32e30d785d8d4a3bc233c Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 10 May 2018 15:29:29 +1200 Subject: keymap: read keys from CONFDIR/keys.yaml by default --- test/mitmproxy/tools/console/test_keymap.py | 1 + test/mitmproxy/utils/test_arg_check.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'test') 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"), -- cgit v1.2.3