tests: support pygments 2.11 (
issue6628)
Differential Revision: https://phab.mercurial-scm.org/D11970
--- a/tests/hghave.py Mon Jan 03 01:09:56 2022 +0100
+++ b/tests/hghave.py Sun Jan 09 13:35:30 2022 +0100
@@ -663,6 +663,22 @@
return (major, minor) >= (2, 5)
+@check("pygments211", "Pygments version >= 2.11")
+def pygments211():
+ try:
+ import pygments
+
+ v = pygments.__version__
+ except ImportError:
+ return False
+
+ parts = v.split(".")
+ major = int(parts[0])
+ minor = int(parts[1])
+
+ return (major, minor) >= (2, 11)
+
+
@check("outer-repo", "outer repo")
def has_outer_repo():
# failing for other reasons than 'no repo' imply that there is a repo
--- a/tests/test-run-tests.t Mon Jan 03 01:09:56 2022 +0100
+++ b/tests/test-run-tests.t Sun Jan 09 13:35:30 2022 +0100
@@ -176,14 +176,19 @@
running 1 tests using 1 parallel processes
\x1b[38;5;124m--- $TESTTMP/test-failure.t\x1b[39m (esc)
- \x1b[38;5;34m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc)
+ \x1b[38;5;28m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc) (pygments211 !)
+ \x1b[38;5;34m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc) (no-pygments211 !)
\x1b[38;5;90;01m@@ -1,4 +1,4 @@\x1b[39;00m (esc)
- $ echo "bar-baz"; echo "bar-bad"; echo foo
- \x1b[38;5;34m+ bar*baz (glob)\x1b[39m (esc)
- bar*bad (glob)
+ \x1b[38;5;250m \x1b[39m $ echo "bar-baz"; echo "bar-bad"; echo foo (esc) (pygments211 !)
+ $ echo "bar-baz"; echo "bar-bad"; echo foo (no-pygments211 !)
+ \x1b[38;5;28m+ bar*baz (glob)\x1b[39m (esc) (pygments211 !)
+ \x1b[38;5;34m+ bar*baz (glob)\x1b[39m (esc) (no-pygments211 !)
+ \x1b[38;5;250m \x1b[39m bar*bad (glob) (esc) (pygments211 !)
+ bar*bad (glob) (no-pygments211 !)
\x1b[38;5;124m- bar*baz (glob)\x1b[39m (esc)
\x1b[38;5;124m- | fo (re)\x1b[39m (esc)
- \x1b[38;5;34m+ foo\x1b[39m (esc)
+ \x1b[38;5;28m+ foo\x1b[39m (esc) (pygments211 !)
+ \x1b[38;5;34m+ foo\x1b[39m (esc) (no-pygments211 !)
\x1b[38;5;88mERROR: \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m output changed\x1b[39m (esc)
!