blob: 31dab2c0c0b22682f1460a2785a20ac72b45e219 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
# HG changeset patch
# User Cédric Krier <ced@b2ck.com>
# Date 1641731730 -3600
# Sun Jan 09 13:35:30 2022 +0100
# Node ID 21c0ae0693bc048907b6e26a4fe160d1b7b48384
# Parent 28f0092ec89f53ccf6d7b2b92dcaf8e1b02e8c13
tests: support pygments 2.11 (issue6628)
Differential Revision: https://phab.mercurial-scm.org/D11970
diff --git a/tests/hghave.py b/tests/hghave.py
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -663,6 +663,22 @@ def pygments25():
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
diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
--- a/tests/test-run-tests.t
+++ b/tests/test-run-tests.t
@@ -176,14 +176,19 @@ test diff colorisation
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)
!
|
