annotate tests/test-websub.t @ 42919:6ccf539aec71

hgweb: fix websub regex flag syntax on Python 3 The `websub` config section for hgweb is broken under Python 3 when using regex flags syntax (ie the optional `i` in the example from `hg help config.websub`: patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i] Flags are pulled out of the specified byte-string using a regular expression, and uppercased. The flags are then iterated over and passed to the `re` module using `re.__dict__[item]`, to get the object attribute of the same name from the `re` module. So on Python 2 if the `il` flags are passed, this transition looks like: `'il'` -> `'IL'` -> `'I'` -> `re.__dict__['I']` -> `re.I` However on Python 3, these are bytes objects. When we iterate over a bytes object in Python 3, instead of getting the individual characters in the string as string objects of length one, we get the integer \ value corresponding to that byte. So the same transition looks like: `b'il'` -> `b'IL'` -> `73` -> `re.__dict__[73]` -> `KeyError` This commit fixes the type mismatch by converting the bytes to a system string before iterating over each element to pass to `re`. The transition will now look like: `b'il'` -> `u'IL'` -> `u'I'` -> `re.__dict__[u'I']` -> `re.I` In addition we expand `test-websub.t` to cover the regex flag case (for both the `websub` section and `interhg`). Differential Revision: https://phab.mercurial-scm.org/D6788
author Connor Sheehan <sheehan@mozilla.com>
date Mon, 09 Sep 2019 13:25:00 -0400
parents 4d2b9b304ad0
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 18629
diff changeset
1 #require serve
15446
c5c9ca3719f9 tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents: 12126
diff changeset
2
12126
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
3 $ hg init test
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
4 $ cd test
10473
634b0e7561ec test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
5
12126
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
6 $ cat > .hg/hgrc <<EOF
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
7 > [extensions]
18629
013fcd112f13 extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 17017
diff changeset
8 > # this is only necessary to check that the mapping from
013fcd112f13 extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 17017
diff changeset
9 > # interhg to websub works
12126
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
10 > interhg =
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
11 >
18629
013fcd112f13 extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 17017
diff changeset
12 > [websub]
013fcd112f13 extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 17017
diff changeset
13 > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>|
42919
6ccf539aec71 hgweb: fix websub regex flag syntax on Python 3
Connor Sheehan <sheehan@mozilla.com>
parents: 25472
diff changeset
14 > tickets = s|ticket(\d+)|<a href="http://ticket.example.org/issue\1">Ticket\1</a>|i
18629
013fcd112f13 extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 17017
diff changeset
15 >
12126
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
16 > [interhg]
18629
013fcd112f13 extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 17017
diff changeset
17 > # check that we maintain some interhg backwards compatibility...
12126
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
18 > # yes, 'x' is a weird delimiter...
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
19 > markbugs = sxbugx<i class="\x">bug</i>x
42919
6ccf539aec71 hgweb: fix websub regex flag syntax on Python 3
Connor Sheehan <sheehan@mozilla.com>
parents: 25472
diff changeset
20 > problems = sxPROBLEMx<i class="\x">problem</i>xi
12126
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
21 > EOF
10473
634b0e7561ec test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
22
12126
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
23 $ touch foo
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
24 $ hg add foo
42919
6ccf539aec71 hgweb: fix websub regex flag syntax on Python 3
Connor Sheehan <sheehan@mozilla.com>
parents: 25472
diff changeset
25 $ hg commit -d '1 0' -m 'Issue123: fixed the bug! Ticket456 and problem789 too'
10473
634b0e7561ec test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
26
12126
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
27 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
28 $ cat hg.pid >> $DAEMON_PIDS
10473
634b0e7561ec test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
29
12126
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
30 log
10473
634b0e7561ec test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
31
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 22046
diff changeset
32 $ get-with-headers.py localhost:$HGPORT "rev/tip" | grep bts
42919
6ccf539aec71 hgweb: fix websub regex flag syntax on Python 3
Connor Sheehan <sheehan@mozilla.com>
parents: 25472
diff changeset
33 <div class="description"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>! <a href="http://ticket.example.org/issue456">Ticket456</a> and <i class="x">problem</i>789 too</div>
12126
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
34 errors
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
35
779098953457 tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 10473
diff changeset
36 $ cat errors.log
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
37
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
38 $ cd ..