Merge branch 'master' into linkcheck_case_insensitive

Author: FazeelUsmani

tests/test_command_line.py

@@ -6,6 +6,7 @@
 
 import pytest
 
+from sphinx._cli.util.errors import strip_escape_sequences
 from sphinx.cmd import make_mode
 from sphinx.cmd.build import get_parser
 from sphinx.cmd.make_mode import run_make_mode
@@ -150,7 +151,7 @@ def test_build_main_parse_arguments_pos_intermixed(
     if broken_argparse:
         with pytest.raises(SystemExit):
             parse_arguments(args)
-        stderr = capsys.readouterr().err.splitlines()
+        stderr = strip_escape_sequences(capsys.readouterr().err).splitlines()
         assert stderr[-1].endswith('error: unrecognized arguments: filename1 filename2')
     else:
         assert parse_arguments(args) == EXPECTED_BUILD_MAIN
@@ -178,12 +179,8 @@ def test_make_mode_parse_arguments_pos_last(
     ]
     with pytest.raises(SystemExit):
         run_make_mode(args)
-    stderr = capsys.readouterr().err.splitlines()
-    # Strip ANSI color codes before checking
-    import re
-
-    stderr_clean = re.sub(r'\x1b\[[0-9;]+m', '', stderr[-1])
-    assert stderr_clean.endswith('error: argument --builder/-b: expected one argument')
+    stderr = strip_escape_sequences(capsys.readouterr().err).splitlines()
+    assert stderr[-1].endswith('error: argument --builder/-b: expected one argument')
 
 
 def test_make_mode_parse_arguments_pos_middle(
@@ -199,12 +196,8 @@ def test_make_mode_parse_arguments_pos_middle(
     ]
     with pytest.raises(SystemExit):
         run_make_mode(args)
-    stderr = capsys.readouterr().err.splitlines()
-    # Strip ANSI color codes before checking
-    import re
-
-    stderr_clean = re.sub(r'\x1b\[[0-9;]+m', '', stderr[-1])
-    assert stderr_clean.endswith('error: argument --builder/-b: expected one argument')
+    stderr = strip_escape_sequences(capsys.readouterr().err).splitlines()
+    assert stderr[-1].endswith('error: argument --builder/-b: expected one argument')
 
 
 @pytest.mark.xfail(
@@ -240,9 +233,5 @@ def test_make_mode_parse_arguments_pos_intermixed(
     ]
     with pytest.raises(SystemExit):
         run_make_mode(args)
-    stderr = capsys.readouterr().err.splitlines()
-    # Strip ANSI color codes before checking
-    import re
-
-    stderr_clean = re.sub(r'\x1b\[[0-9;]+m', '', stderr[-1])
-    assert stderr_clean.endswith('error: argument --builder/-b: expected one argument')
+    stderr = strip_escape_sequences(capsys.readouterr().err).splitlines()
+    assert stderr[-1].endswith('error: argument --builder/-b: expected one argument')