fixup

PierreMarchand20 · Dec 9, 2023 · 083a25d · 083a25d
1 parent 883d547
commit 083a25d
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 52 deletions.
diff --git a/tests/reference_output/backward_search.cast b/tests/reference_output/backward_search.cast
@@ -2,9 +2,9 @@ $ touch my_first_file.txt
 $ touch my_second_file.txt
 $ rm my_first_file.txt
 $ 
-(reverse-i-search)`': t': rm my_first_file.tx[7mt[27m
-(reverse-i-search)`to': [7mto[27much my_second_file.txt[1@u': [7mtou[27m[1@c': [7mtouc[27m[1@h': [7mtouch[27m[7mtouch[27m my_[1Pfirst
-[25P$ touch
+(reverse-i-search)`': t': rm my_first_file.txt
+(reverse-i-search)`to': touch my_second_file.txtu': touc': touch': touchtouch my_first
+$ touch
 $ 
 $ ls my_first_file.txt
 my_first_file.txt

diff --git a/tests/reference_output/history.cast b/tests/reference_output/history.cast
@@ -2,8 +2,8 @@ $ touch my_first_file.txt
 $ touch my_second_file.txt
 $ rm my_first_file.txt
 $ rm my_first_file.txt
-$ [4@touch my_second_file.txt
-$ touch my_[1Pfirst_file.txt
+$ touch my_second_file.txt
+$ touch my_first_file.txt
 $ ls
 my_first_file.txt  my_second_file.txt
 $ exit
diff --git a/tests/reference_output/man_page.cast b/tests/reference_output/man_page.cast
@@ -1,47 +1,47 @@
 $ man echo
-[?1049h[22;0;0t[?1h=
-ECHO(1)                          User Commands                         ECHO(1)[m
-[m
-[1mNAME[0m[m
-       echo - display a line of text[m
-[m
-[1mSYNOPSIS[0m[m
-       [1mecho[0m [[4mSHORT-OPTION[24m]... [[4mSTRING[24m]...[m
-       [1mecho[0m [4mLONG-OPTION[24m[m
-[m
-[1mDESCRIPTION[0m[m
-       Echo the STRING(s) to standard output.[m
-[m
-       [1m-n[0m     do not output the trailing newline[m
-[m
-       [1m-e[0m     enable interpretation of backslash escapes[m
-[m
-       [1m-E[0m     disable interpretation of backslash escapes (default)[m
-[m
-       [1m--help[0m display this help and exit[m
-[m
-       [1m--version[0m[m
-              output version information and exit[m
-[m
-[7m Manual page echo(1) line 1 (press h for help or q to quit)[27m[K
-[K [KESCESC[K[[[KBB
-[K[7m Manual page echo(1) line 1 (press h for help or q to quit)[27m[K
-[K       If [1m-e[0m is in effect, the following sequences are recognized:[m
-[7m Manual page echo(1) line 2 (press h for help or q to quit)[27m[K
-[K [KESCESC[K[[[KBB
-[K[7m Manual page echo(1) line 2 (press h for help or q to quit)[27m[K
-[K[m
-[7m Manual page echo(1) line 3 (press h for help or q to quit)[27m[K
-[K [KESCESC[K[[[KBB
-[K[7m Manual page echo(1) line 3 (press h for help or q to quit)[27m[K
-[K       \\     backslash[m
-[7m Manual page echo(1) line 4 (press h for help or q to quit)[27m[K
-[K [KESCESC[K[[[KBB
-[K[7m Manual page echo(1) line 4 (press h for help or q to quit)[27m[K
-[K[m
-[7m Manual page echo(1) line 5 (press h for help or q to quit)[27m[K
-[K [KESCESC[K[[[KBB
-[K[7m Manual page echo(1) line 5 (press h for help or q to quit)[27m[K
-[K       \a     alert (BEL)[m
-[7m Manual page echo(1) line 6 (press h for help or q to quit)[27m[K
-[K[?1l>[?1049l[23;0;0t$ exit
+=
+ECHO(1)                          User Commands                         ECHO(1)
+
+NAME
+       echo - display a line of text
+
+SYNOPSIS
+       echo [SHORT-OPTION]... [STRING]...
+       echo LONG-OPTION
+
+DESCRIPTION
+       Echo the STRING(s) to standard output.
+
+       -n     do not output the trailing newline
+
+       -e     enable interpretation of backslash escapes
+
+       -E     disable interpretation of backslash escapes (default)
+
+       --help display this help and exit
+
+       --version
+              output version information and exit
+
+ Manual page echo(1) line 1 (press h for help or q to quit)
+ ESCESC[[BB
+ Manual page echo(1) line 1 (press h for help or q to quit)
+       If -e is in effect, the following sequences are recognized:
+ Manual page echo(1) line 2 (press h for help or q to quit)
+ ESCESC[[BB
+ Manual page echo(1) line 2 (press h for help or q to quit)
+
+ Manual page echo(1) line 3 (press h for help or q to quit)
+ ESCESC[[BB
+ Manual page echo(1) line 3 (press h for help or q to quit)
+       \\     backslash
+ Manual page echo(1) line 4 (press h for help or q to quit)
+ ESCESC[[BB
+ Manual page echo(1) line 4 (press h for help or q to quit)
+
+ Manual page echo(1) line 5 (press h for help or q to quit)
+ ESCESC[[BB
+ Manual page echo(1) line 5 (press h for help or q to quit)
+       \a     alert (BEL)
+ Manual page echo(1) line 6 (press h for help or q to quit)
+>$ exit
diff --git a/tests/test_regression.py b/tests/test_regression.py
@@ -54,7 +54,9 @@ def test_regression(tmp_path, request, inputfile: pathlib.Path):
 
     with open(output_folder / output_file_name, "r") as output_file:
         with pathlib.Path(reference_folder / output_file_name).open() as reference_file:
-            ansi_escape = re.compile(r"\x1b(.*?)t", re.VERBOSE)
+            ansi_escape = re.compile(
+                r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])", re.VERBOSE
+            )
             output_text = output_file.read()
             cleaned_output_text = ansi_escape.sub("", output_text)
             assert cleaned_output_text == reference_file.read()