aboutsummaryrefslogtreecommitdiffstats
path: root/test/mitmproxy/tools/console/test_common.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2018-01-05 20:26:57 +0100
committerGitHub <noreply@github.com>2018-01-05 20:26:57 +0100
commit1c769b0991d92abd56a098eb869d414f5fa6b5d9 (patch)
treed331c36b1681c2c91b38fe0c09058d3cbdc49177 /test/mitmproxy/tools/console/test_common.py
parentc1c1652082f680e7448e44cfbbb536223a100a09 (diff)
parenta6bd53534b0a89c4ef055bc38b26660712226db8 (diff)
downloadmitmproxy-1c769b0991d92abd56a098eb869d414f5fa6b5d9.tar.gz
mitmproxy-1c769b0991d92abd56a098eb869d414f5fa6b5d9.tar.bz2
mitmproxy-1c769b0991d92abd56a098eb869d414f5fa6b5d9.zip
Merge pull request #2759 from mhils/issue-1833
Fix #1833, clean up common.format_keyvals
Diffstat (limited to 'test/mitmproxy/tools/console/test_common.py')
-rw-r--r--test/mitmproxy/tools/console/test_common.py28
1 files changed, 25 insertions, 3 deletions
diff --git a/test/mitmproxy/tools/console/test_common.py b/test/mitmproxy/tools/console/test_common.py
index 3ab4fd67..72438c49 100644
--- a/test/mitmproxy/tools/console/test_common.py
+++ b/test/mitmproxy/tools/console/test_common.py
@@ -1,12 +1,34 @@
+import urwid
+
from mitmproxy.test import tflow
from mitmproxy.tools.console import common
-from ....conftest import skip_appveyor
-
-@skip_appveyor
def test_format_flow():
f = tflow.tflow(resp=True)
assert common.format_flow(f, True)
assert common.format_flow(f, True, hostheader=True)
assert common.format_flow(f, True, extended=True)
+
+
+def test_format_keyvals():
+ assert common.format_keyvals(
+ [
+ ("aa", "bb"),
+ ("cc", "dd"),
+ ("ee", None),
+ ]
+ )
+ wrapped = urwid.BoxAdapter(
+ urwid.ListBox(
+ urwid.SimpleFocusListWalker(
+ common.format_keyvals([("foo", "bar")])
+ )
+ ), 1
+ )
+ assert wrapped.render((30, ))
+ assert common.format_keyvals(
+ [
+ ("aa", wrapped)
+ ]
+ )