Merge pull request #83326 from eeckstein/fix-benchmark-tests

eeckstein · web-flow · commit c21c9b0f3244 · 2025-07-25T20:36:50.000+02:00
benchmark script tests: make the match string for invalid option errors more flexible
diff --git a/benchmark/scripts/test_Benchmark_Driver.py b/benchmark/scripts/test_Benchmark_Driver.py
@@ -112,7 +112,7 @@ def test_optimization_argument(self):
             [
                 "error:",
                 "argument -o/--optimization: invalid choice: 'bogus'",
-                "(choose from 'O', 'Onone', 'Osize')",
+                "(choose from ",
             ],
             err.getvalue(),
         )
diff --git a/benchmark/scripts/test_compare_perf_tests.py b/benchmark/scripts/test_compare_perf_tests.py
@@ -860,7 +860,7 @@ def test_format_argument(self):
             )
         self.assertIn(
             "error: argument --format: invalid choice: 'bogus' "
-            "(choose from 'markdown', 'git', 'html')",
+            "(choose from ",
             err.getvalue(),
         )
 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ def test_optimization_argument(self):`
`112`	`112`	`[`
`113`	`113`	`"error:",`
`114`	`114`	`"argument -o/--optimization: invalid choice: 'bogus'",`
`115`		`- "(choose from 'O', 'Onone', 'Osize')",`
	`115`	`+ "(choose from ",`
`116`	`116`	`],`
`117`	`117`	`err.getvalue(),`
`118`	`118`	`)`
Original file line number	Diff line number	Diff line change
`@@ -860,7 +860,7 @@ def test_format_argument(self):`
`860`	`860`	`)`
`861`	`861`	`self.assertIn(`
`862`	`862`	`"error: argument --format: invalid choice: 'bogus' "`
`863`		`- "(choose from 'markdown', 'git', 'html')",`
	`863`	`+ "(choose from ",`
`864`	`864`	`err.getvalue(),`
`865`	`865`	`)`
`866`	`866`