refactor common.format_keyvals

the semantics here were really quite unclear,
now it is hopefully a bit more obvious what's happening.
Once we are Python 3.6+ exclusively, we may consider changing
the signature to accept a (order-preserving) dict instead of a list.

2 files changed, 25 insertions, 13 deletions

diff --git a/test/mitmproxy/tools/console/test_common.py b/test/mitmproxy/tools/console/test_common.py
index a996c010..72438c49 100644
--- a/test/mitmproxy/tools/console/test_common.py
+++ b/test/mitmproxy/tools/console/test_common.py
@@ -1,3 +1,5 @@
+import urwid
+
 from mitmproxy.test import tflow
 from mitmproxy.tools.console import common
 
@@ -7,3 +9,26 @@ def test_format_flow():
     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)
+        ]
+    )
diff --git a/test/mitmproxy/tools/console/test_master.py b/test/mitmproxy/tools/console/test_master.py
index 3aa0dc54..9779a482 100644
--- a/test/mitmproxy/tools/console/test_master.py
+++ b/test/mitmproxy/tools/console/test_master.py
@@ -4,22 +4,9 @@ from mitmproxy import options
 from mitmproxy.test import tflow
 from mitmproxy.test import tutils
 from mitmproxy.tools import console
-from mitmproxy.tools.console import common
 from ... import tservers
 
 
-def test_format_keyvals():
-    assert common.format_keyvals(
-        [
-            ("aa", "bb"),
-            None,
-            ("cc", "dd"),
-            (None, "dd"),
-            (None, "dd"),
-        ]
-    )
-
-
 def test_options():
     assert options.Options(replay_kill_extra=True)