=== modified file 'mandos-ctl'
--- mandos-ctl	2019-03-12 18:11:55 +0000
+++ mandos-ctl	2019-03-12 19:15:52 +0000
@@ -934,35 +934,96 @@
     def test_verbose(self):
         output = PrintTableCmd(verbose=True).output(
             self.clients.values())
-        expected_output = "\n".join((
-            # First line (headers)
-            "Name   Enabled Timeout  Last Successful Check Created   "
-            "          Interval Host            Key ID               "
-            "                                            Fingerprint "
-            "                             Check Is Running Last Enabl"
-            "ed        Approval Is Pending Approved By Default Last A"
-            "pproval Request Approval Delay Approval Duration Checker"
-            "              Extended Timeout Expires             Last "
-            "Checker Status",
-            # Second line (client "foo")
-            "foo    Yes     00:05:00 2019-02-03T00:00:00   2019-01-02"
-            "T00:00:00 00:02:00 foo.example.org 92ed150794387c03ce684"
-            "574b1139a6594a34f895daaaf09fd8ea90a27cddb12 778827225BA7"
-            "DE539C5A7CFA59CFF7CDBD9A5920 No               2019-01-03"
-            "T00:00:00 No                  Yes                       "
-            "                00:00:00       00:00:01          fping -"
-            "q -- %(host)s 00:15:00         2019-02-04T00:00:00 0    "
-            "              ",
-            # Third line (client "barbar")
-            "barbar Yes     00:05:00 2019-02-04T00:00:00   2019-01-03"
-            "T00:00:00 00:02:00 192.0.2.3       0558568eedd67d622f5c8"
-            "3b35a115f796ab612cff5ad227247e46c2b020f441c 3E393AEAEFB8"
-            "4C7E89E2F547B3A107558FCA3A27 Yes              2019-01-04"
-            "T00:00:00 No                  No                  2019-0"
-            "1-03T00:00:00   00:00:30       00:00:01          :      "
-            "              00:15:00         2019-02-05T00:00:00 -2   "
-            "              ",
-        ))
+        columns = (
+            (
+                "Name   ",
+                "foo    ",
+                "barbar ",
+            ),(
+                "Enabled ",
+                "Yes     ",
+                "Yes     ",
+            ),(
+                "Timeout  ",
+                "00:05:00 ",
+                "00:05:00 ",
+            ),(
+                "Last Successful Check ",
+                "2019-02-03T00:00:00   ",
+                "2019-02-04T00:00:00   ",
+            ),(
+                "Created             ",
+                "2019-01-02T00:00:00 ",
+                "2019-01-03T00:00:00 ",
+            ),(
+                "Interval ",
+                "00:02:00 ",
+                "00:02:00 ",
+            ),(
+                "Host            ",
+                "foo.example.org ",
+                "192.0.2.3       ",
+            ),(
+                ("Key ID                                             "
+                 "              "),
+                ("92ed150794387c03ce684574b1139a6594a34f895daaaf09fd8"
+                 "ea90a27cddb12 "),
+                ("0558568eedd67d622f5c83b35a115f796ab612cff5ad227247e"
+                 "46c2b020f441c "),
+            ),(
+                "Fingerprint                              ",
+                "778827225BA7DE539C5A7CFA59CFF7CDBD9A5920 ",
+                "3E393AEAEFB84C7E89E2F547B3A107558FCA3A27 ",
+            ),(
+                "Check Is Running ",
+                "No               ",
+                "Yes              ",
+            ),(
+                "Last Enabled        ",
+                "2019-01-03T00:00:00 ",
+                "2019-01-04T00:00:00 ",
+            ),(
+                "Approval Is Pending ",
+                "No                  ",
+                "No                  ",
+            ),(
+                "Approved By Default ",
+                "Yes                 ",
+                "No                  ",
+            ),(
+                "Last Approval Request ",
+                "                      ",
+                "2019-01-03T00:00:00   ",
+            ),(
+                "Approval Delay ",
+                "00:00:00       ",
+                "00:00:30       ",
+            ),(
+                "Approval Duration ",
+                "00:00:01          ",
+                "00:00:01          ",
+            ),(
+                "Checker              ",
+                "fping -q -- %(host)s ",
+                ":                    ",
+            ),(
+                "Extended Timeout ",
+                "00:15:00         ",
+                "00:15:00         ",
+            ),(
+                "Expires             ",
+                "2019-02-04T00:00:00 ",
+                "2019-02-05T00:00:00 ",
+            ),(
+                "Last Checker Status",
+                "0                  ",
+                "-2                 ",
+            )
+        )
+        num_lines = max(len(rows) for rows in columns)
+        expected_output = "\n".join("".join(rows[line]
+                                            for rows in columns)
+                                    for line in range(num_lines))
         self.assertEqual(output, expected_output)
     def test_one_client(self):
         output = PrintTableCmd().output(self.one_client.values())