Mercurial > hg
annotate tests/test-websub.t @ 41710:4028897dfa05
url: always use str for proxy configuration
Previously, proxies didn't work on Python 3 for various reasons.
First, the keys to the "proxies" dict are fed into a
`setattr(self, "%s_open", ...)` call and passing bytestrings
results in setting an oddly named attribute due to the b''
in %s formatting. This resulted in "http_open" and "https_open"
not being properly overridden and proxies not being used.
Second, the standard library was expecting proxy URLs to be
str. And various operations (including our custom code in
url.py) would fail to account for the str/bytes mismatch.
This commit normalizes everything to str and adjusts our
proxy code in url.py to account for the presence of str
on Python 3.
Differential Revision: https://phab.mercurial-scm.org/D5952
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 15 Feb 2019 13:16:07 -0800 |
parents | 4d2b9b304ad0 |
children | 6ccf539aec71 |
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>| |
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
14 > |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
15 > [interhg] |
18629
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
16 > # check that we maintain some interhg backwards compatibility... |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
17 > # yes, 'x' is a weird delimiter... |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
18 > markbugs = sxbugx<i class="\x">bug</i>x |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
19 > EOF |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
20 |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
21 $ touch foo |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
22 $ hg add foo |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
23 $ hg commit -d '1 0' -m 'Issue123: fixed the bug!' |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
24 |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
25 $ 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
|
26 $ cat hg.pid >> $DAEMON_PIDS |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
27 |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
28 log |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
29 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
22046
diff
changeset
|
30 $ get-with-headers.py localhost:$HGPORT "rev/tip" | grep bts |
18629
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
31 <div class="description"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>!</div> |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
32 errors |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
33 |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
34 $ cat errors.log |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
35 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
36 $ cd .. |