Improve accuracy of test_cli_converters

python · erlend-aasland · Jul 24, 2023 · Jul 23, 2023 · Jul 23, 2023 · Jul 23, 2023
commit a4adb705d7d8e23d413a8f12f7066df558d10ca0
@@ -1518,14 +1518,22 @@ def test_cli_converters(self):
         out = self.expect_success("--converters")
         # We cannot simply compare the output, because the repr of the *accept*
         # param may change (it's a set, thus unordered). So, let's compare the
-        # start and end of the expected output, and then assert we've got a
-        # line for each converter.
+        # start and end of the expected output, and then assert that the
+        # converters appear lined up in alphabetical order.
         self.assertTrue(out.startswith(prelude), out)
-        for converter in expected_converters:
-            with self.subTest(converter=converter):
-                self.assertIn(converter, out)
         self.assertTrue(out.endswith(finale), out)
 
+        out = out.removeprefix(prelude)
+        out = out.removesuffix(finale)
+        lines = out.split("\n")
+        for converter, line in zip(expected_converters, lines):
+            line = line.lstrip()
+            with self.subTest(converter=converter):
+                self.assertTrue(
+                    line.startswith(converter),
+                    f"expected converter {converter!r}, got {line!r}"
+                )
+
 
 try:
     import _testclinic as ac_tester