This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10633

tests: ensure `$PYTHON` is quoted for Windows
ClosedPublic

Authored by mharbison72 on May 3 2021, 2:21 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG1d075b857c90: tests: ensure `$PYTHON` is quoted for Windows
Summary

Global installs of python3 go into "Program Files", and tons of tests fail with
mysterious errors if this isn't quoted. Most of this is a followup to
0826d684a1b5, but a some of these were existing issues. Shebang lines are
ignored because quoting breaks direct execution- these will need to be launched
indirectly with the quoted $PYTHON command.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.May 3 2021, 2:21 PM
Alphare accepted this revision.May 6 2021, 12:26 PM
This revision is now accepted and ready to land.May 6 2021, 12:26 PM
baymax updated this revision to Diff 27672.May 6 2021, 1:16 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

mharbison72 added a commit: rHG1d075b857c90: tests: ensure `$PYTHON` is quoted for Windows.May 6 2021, 1:20 PM
Closed by commit rHG1d075b857c90: tests: ensure `$PYTHON` is quoted for Windows (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 27677

tests/library-infinitepush.sh

done done
} }
setupcommon() { setupcommon() {
cat >> $HGRCPATH << EOF cat >> $HGRCPATH << EOF
[extensions] [extensions]
infinitepush= infinitepush=
[ui] [ui]
ssh = $PYTHON "$TESTDIR/dummyssh" ssh = "$PYTHON" "$TESTDIR/dummyssh"
[infinitepush] [infinitepush]
branchpattern=re:scratch/.* branchpattern=re:scratch/.*
EOF EOF
} }
setupserver() { setupserver() {
cat >> .hg/hgrc << EOF cat >> .hg/hgrc << EOF
[infinitepush] [infinitepush]

tests/narrow-library.sh

cat >> $HGRCPATH <<EOF cat >> $HGRCPATH <<EOF
[extensions] [extensions]
narrow= narrow=
[ui] [ui]
ssh=$PYTHON "$RUNTESTDIR/dummyssh" ssh="$PYTHON" "$RUNTESTDIR/dummyssh"
[experimental] [experimental]
changegroup3 = True changegroup3 = True
EOF EOF

tests/remotefilelog-library.sh

CACHEDIR=$PWD/hgcache CACHEDIR=$PWD/hgcache
cat >> $HGRCPATH <<EOF cat >> $HGRCPATH <<EOF
[remotefilelog] [remotefilelog]
cachepath=$CACHEDIR cachepath=$CACHEDIR
debug=True debug=True
[extensions] [extensions]
remotefilelog= remotefilelog=
rebase= rebase=
strip= strip=
[ui] [ui]
ssh=$PYTHON "$TESTDIR/dummyssh" ssh="$PYTHON" "$TESTDIR/dummyssh"
[server] [server]
preferuncompressed=True preferuncompressed=True
[experimental] [experimental]
changegroup3=True changegroup3=True
[rebase] [rebase]
singletransaction=True singletransaction=True
EOF EOF
mkcommit() { mkcommit() {
echo "$1" > "$1" echo "$1" > "$1"
hg add "$1" hg add "$1"
hg ci -m "$1" hg ci -m "$1"
} }
ls_l() { ls_l() {
$PYTHON $TESTDIR/ls-l.py "$@" "$PYTHON" $TESTDIR/ls-l.py "$@"
} }
identifyrflcaps() { identifyrflcaps() {
xargs -n 1 echo | egrep '(remotefilelog|getflogheads|getfile)' | sort xargs -n 1 echo | egrep '(remotefilelog|getflogheads|getfile)' | sort
} }

tests/test-check-pyflakes.t

#require test-repo pyflakes hg10 #require test-repo pyflakes hg10
$ . "$TESTDIR/helpers-testrepo.sh" $ . "$TESTDIR/helpers-testrepo.sh"
run pyflakes on all tracked files ending in .py or without a file ending run pyflakes on all tracked files ending in .py or without a file ending
(skipping binary file random-seed) (skipping binary file random-seed)
$ cat > test.py <<EOF $ cat > test.py <<EOF
> print(undefinedname) > print(undefinedname)
> EOF > EOF
$ $PYTHON -m pyflakes test.py 2>/dev/null | "$TESTDIR/filterpyflakes.py" $ "$PYTHON" -m pyflakes test.py 2>/dev/null | "$TESTDIR/filterpyflakes.py"
test.py:1:* undefined name 'undefinedname' (glob) test.py:1:* undefined name 'undefinedname' (glob)
$ cd "`dirname "$TESTDIR"`" $ cd "`dirname "$TESTDIR"`"
$ testrepohg locate 'set:**.py or grep("^#!.*python")' \ $ testrepohg locate 'set:**.py or grep("^#!.*python")' \
> -X hgext/fsmonitor/pywatchman \ > -X hgext/fsmonitor/pywatchman \
> -X mercurial/pycompat.py -X contrib/python-zstandard \ > -X mercurial/pycompat.py -X contrib/python-zstandard \
> -X mercurial/thirdparty \ > -X mercurial/thirdparty \
> 2>/dev/null \ > 2>/dev/null \
> | xargs $PYTHON -m pyflakes 2>/dev/null | "$TESTDIR/filterpyflakes.py" > | xargs "$PYTHON" -m pyflakes 2>/dev/null | "$TESTDIR/filterpyflakes.py"
contrib/perf.py:*:* undefined name 'xrange' (glob) (?) contrib/perf.py:*:* undefined name 'xrange' (glob) (?)
mercurial/hgweb/server.py:*:* undefined name 'reload' (glob) (?) mercurial/hgweb/server.py:*:* undefined name 'reload' (glob) (?)
mercurial/util.py:*:* undefined name 'file' (glob) (?) mercurial/util.py:*:* undefined name 'file' (glob) (?)
mercurial/encoding.py:*:* undefined name 'localstr' (glob) (?) mercurial/encoding.py:*:* undefined name 'localstr' (glob) (?)

tests/test-convert-svn-encoding.t

$ cat .hgtags $ cat .hgtags
e94e4422020e715add80525e8f0f46c9968689f1 branch\xc3\xa9e (esc) e94e4422020e715add80525e8f0f46c9968689f1 branch\xc3\xa9e (esc)
f7e66f98380ed1e53a797c5c7a7a2616a7ab377d branch\xc3\xa9 (esc) f7e66f98380ed1e53a797c5c7a7a2616a7ab377d branch\xc3\xa9 (esc)
$ cd .. $ cd ..
Subversion sources don't support non-ASCII characters in HTTP(S) URLs. Subversion sources don't support non-ASCII characters in HTTP(S) URLs.
$ XFF=$($PYTHON -c 'from mercurial.utils.procutil import stdout; stdout.write(b"\xff")') $ XFF=$("$PYTHON" -c 'from mercurial.utils.procutil import stdout; stdout.write(b"\xff")')
$ hg convert --source-type=svn http://localhost:$HGPORT/$XFF test $ hg convert --source-type=svn http://localhost:$HGPORT/$XFF test
initializing destination test repository initializing destination test repository
Subversion sources don't support non-ASCII characters in HTTP(S) URLs. Please percent-encode them. Subversion sources don't support non-ASCII characters in HTTP(S) URLs. Please percent-encode them.
http://localhost:$HGPORT/\xff does not look like a Subversion repository (esc) http://localhost:$HGPORT/\xff does not look like a Subversion repository (esc)
abort: http://localhost:$HGPORT/\xff: missing or unsupported repository (esc) abort: http://localhost:$HGPORT/\xff: missing or unsupported repository (esc)
[255] [255]
In Subversion, paths are Unicode (encoded as UTF-8). Therefore paths that can't In Subversion, paths are Unicode (encoded as UTF-8). Therefore paths that can't

tests/test-fuzz-targets.t

> EOF > EOF
> $CXX $TESTTMP/dummy.cc -o $TESTTMP/dummy \ > $CXX $TESTTMP/dummy.cc -o $TESTTMP/dummy \
> -fsanitize=fuzzer-no-link,address || return 1 > -fsanitize=fuzzer-no-link,address || return 1
> } > }
Try to find a python3-config that's next to our sys.executable. If Try to find a python3-config that's next to our sys.executable. If
that doesn't work, fall back to looking for a global python3-config that doesn't work, fall back to looking for a global python3-config
and hope that works out for the best. and hope that works out for the best.
$ PYBIN=`$PYTHON -c 'import sys, os; print(os.path.dirname(sys.executable))'` $ PYBIN=`"$PYTHON" -c 'import sys, os; print(os.path.dirname(sys.executable))'`
$ if [ -x "$PYBIN/python3-config" ] ; then $ if [ -x "$PYBIN/python3-config" ] ; then
> PYTHON_CONFIG="$PYBIN/python3-config" > PYTHON_CONFIG="$PYBIN/python3-config"
> else > else
> PYTHON_CONFIG="`which python3-config`" > PYTHON_CONFIG="`which python3-config`"
> fi > fi
#if clang-libfuzzer #if clang-libfuzzer
$ CXX=clang++ havefuzz || exit 80 $ CXX=clang++ havefuzz || exit 80

tests/test-infinitepush-ci.t

#require no-reposimplestore #require no-reposimplestore
Testing the case when there is no infinitepush extension present on the client Testing the case when there is no infinitepush extension present on the client
side and the server routes each push to bundlestore. This case is very much side and the server routes each push to bundlestore. This case is very much
similar to CI use case. similar to CI use case.
Setup Setup
----- -----
$ . "$TESTDIR/library-infinitepush.sh" $ . "$TESTDIR/library-infinitepush.sh"
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [ui] > [ui]
> ssh = $PYTHON "$TESTDIR/dummyssh" > ssh = "$PYTHON" "$TESTDIR/dummyssh"
> [alias] > [alias]
> glog = log -GT "{rev}:{node|short} {desc}\n{phase}" > glog = log -GT "{rev}:{node|short} {desc}\n{phase}"
> EOF > EOF
$ cp $HGRCPATH $TESTTMP/defaulthgrc $ cp $HGRCPATH $TESTTMP/defaulthgrc
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ setupserver $ setupserver
$ echo "pushtobundlestore = True" >> .hg/hgrc $ echo "pushtobundlestore = True" >> .hg/hgrc

tests/test-nointerrupt.t

$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> sleepext = ../sleepext.py > sleepext = ../sleepext.py
> EOF > EOF
Test ctrl-c Test ctrl-c
$ $PYTHON $TESTTMP/timeout.py -s INT 1 hg sleep 2 $ "$PYTHON" $TESTTMP/timeout.py -s INT 1 hg sleep 2
interrupted! interrupted!
[124] [124]
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> nointerrupt = yes > nointerrupt = yes
> EOF > EOF
$ $PYTHON $TESTTMP/timeout.py -s INT 1 hg sleep 2 $ "$PYTHON" $TESTTMP/timeout.py -s INT 1 hg sleep 2
interrupted! interrupted!
[124] [124]
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> nointerrupt-interactiveonly = False > nointerrupt-interactiveonly = False
> EOF > EOF
$ $PYTHON $TESTTMP/timeout.py -s INT 1 hg sleep 2 $ "$PYTHON" $TESTTMP/timeout.py -s INT 1 hg sleep 2
shutting down cleanly shutting down cleanly
press ^C again to terminate immediately (dangerous) press ^C again to terminate immediately (dangerous)
end of unsafe operation end of unsafe operation
interrupted! interrupted!
[124] [124]

tests/test-remotefilelog-cacheprocess.t

> raise Exception('unknown command! %r' % cmd) > raise Exception('unknown command! %r' % cmd)
> except Exception as e: > except Exception as e:
> log('Exception! %s\n' % e) > log('Exception! %s\n' % e)
> raise > raise
> EOF > EOF
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [remotefilelog] > [remotefilelog]
> cacheprocess = $PYTHON $TESTTMP/cacheprocess-logger.py > cacheprocess = "$PYTHON" $TESTTMP/cacheprocess-logger.py
> EOF > EOF
Test cache keys and cache misses. Test cache keys and cache misses.
$ hgcloneshallow ssh://user@dummy/repo clone -q $ hgcloneshallow ssh://user@dummy/repo clone -q
3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob) 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob)
$ cat cachelog.log $ cat cachelog.log
got command 'get' got command 'get'
client wants 3 blobs client wants 3 blobs

tests/test-remotefilelog-gc.t

$ cd shallow $ cd shallow
$ hg pull -q $ hg pull -q
$ hg update -q $ hg update -q
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
$ cd .. $ cd ..
# gc client cache # gc client cache
$ lastweek=`$PYTHON -c 'import datetime,time; print(datetime.datetime.fromtimestamp(time.time() - (86400 * 7)).strftime("%y%m%d%H%M"))'` $ lastweek=`"$PYTHON" -c 'import datetime,time; print(datetime.datetime.fromtimestamp(time.time() - (86400 * 7)).strftime("%y%m%d%H%M"))'`
$ find $CACHEDIR -type f -exec touch -t $lastweek {} \; $ find $CACHEDIR -type f -exec touch -t $lastweek {} \;
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
$TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/1406e74118627694268417491f018a4a883152f0 (glob) $TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/1406e74118627694268417491f018a4a883152f0 (glob)
$TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/48023ec064c1d522f0d792a5a912bb1bf7859a4a (glob) $TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/48023ec064c1d522f0d792a5a912bb1bf7859a4a (glob)
$TESTTMP/hgcache/repos (glob) $TESTTMP/hgcache/repos (glob)
$ hg gc $ hg gc
finished: removed 1 of 2 files (0.00 GB to 0.00 GB) finished: removed 1 of 2 files (0.00 GB to 0.00 GB)

tests/test-remotefilelog-http.t

#require no-windows #require no-windows
$ . "$TESTDIR/remotefilelog-library.sh" $ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master $ hg init master
$ cd master $ cd master
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [remotefilelog] > [remotefilelog]
> server=True > server=True
> EOF > EOF
$ echo x > x $ echo x > x
$ echo y > y $ echo y > y
$ hg commit -qAm x $ hg commit -qAm x
$ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log -A ../access.log $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log -A ../access.log
Build a query string for later use: Build a query string for later use:
$ GET=`hg debugdata -m 0 | $PYTHON -c \ $ GET=`hg debugdata -m 0 | "$PYTHON" -c \
> 'import sys ; print([("?cmd=x_rfl_getfile&file=%s&node=%s" % tuple(s.split("\0"))) for s in sys.stdin.read().splitlines()][0])'` > 'import sys ; print([("?cmd=x_rfl_getfile&file=%s&node=%s" % tuple(s.split("\0"))) for s in sys.stdin.read().splitlines()][0])'`
$ cd .. $ cd ..
$ cat hg1.pid >> $DAEMON_PIDS $ cat hg1.pid >> $DAEMON_PIDS
$ hgcloneshallow http://localhost:$HGPORT/ shallow -q $ hgcloneshallow http://localhost:$HGPORT/ shallow -q
2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob) 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)

tests/test-unified-test.t

crlf crlf
cr\r (no-eol) (esc) cr\r (no-eol) (esc)
\tcrlf (esc) \tcrlf (esc)
crlf\r (esc) crlf\r (esc)
#endif #endif
Escapes: Escapes:
$ $PYTHON -c 'from mercurial.utils.procutil import stdout; stdout.write(b"\xff")' $ "$PYTHON" -c 'from mercurial.utils.procutil import stdout; stdout.write(b"\xff")'
\xff (no-eol) (esc) \xff (no-eol) (esc)
Escapes with conditions: Escapes with conditions:
$ $PYTHON -c 'from mercurial.utils.procutil import stdout; stdout.write(b"\xff")' $ "$PYTHON" -c 'from mercurial.utils.procutil import stdout; stdout.write(b"\xff")'
\xff (no-eol) (esc) (true !) \xff (no-eol) (esc) (true !)
Combining esc with other markups - and handling lines ending with \r instead of \n: Combining esc with other markups - and handling lines ending with \r instead of \n:
$ printf 'foo/bar\r' $ printf 'foo/bar\r'
fo?/bar\r (no-eol) (glob) (esc) fo?/bar\r (no-eol) (glob) (esc)
#if windows #if windows
$ printf 'foo\\bar\r' $ printf 'foo\\bar\r'

tests/test-update-atomic.t

$ hg commit -qm _ $ hg commit -qm _
Check behavior without update.atomic-file Check behavior without update.atomic-file
$ hg update -r 0 -q $ hg update -r 0 -q
$ hg update -r 1 --config extensions.showwrites=.hg/showwrites.py 2>&1 | grep "a1'.*wb" $ hg update -r 1 --config extensions.showwrites=.hg/showwrites.py 2>&1 | grep "a1'.*wb"
('vfs open', ('a1', 'wb'), [('atomictemp', False), ('backgroundclose', True)]) ('vfs open', ('a1', 'wb'), [('atomictemp', False), ('backgroundclose', True)])
$ $PYTHON $TESTTMP/show_mode.py * $ "$PYTHON" $TESTTMP/show_mode.py *
a1:0644 a1:0644
a2:0755 a2:0755
b1:0644 b1:0644
b2:0755 b2:0755
d:0644 d:0644
ro:0644 ro:0644
Add a second revision for the ro file so we can test update when the file is Add a second revision for the ro file so we can test update when the file is
present or not present or not
$ echo "ro" > ro $ echo "ro" > ro
$ hg commit -qm _ $ hg commit -qm _
Check behavior without update.atomic-file first Check behavior without update.atomic-file first
$ hg update -C -r 0 -q $ hg update -C -r 0 -q
$ hg update -r 1 $ hg update -r 1
6 files updated, 0 files merged, 1 files removed, 0 files unresolved 6 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ $PYTHON $TESTTMP/show_mode.py * $ "$PYTHON" $TESTTMP/show_mode.py *
a1:0644 a1:0644
a2:0755 a2:0755
b1:0644 b1:0644
b2:0755 b2:0755
d:0644 d:0644
ro:0644 ro:0644
Manually reset the mode of the read-only file Manually reset the mode of the read-only file
$ chmod a-w ro $ chmod a-w ro
$ $PYTHON $TESTTMP/show_mode.py ro $ "$PYTHON" $TESTTMP/show_mode.py ro
ro:0444 ro:0444
Now the file is present, try to update and check the permissions of the file Now the file is present, try to update and check the permissions of the file
$ hg up -r 2 $ hg up -r 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ $PYTHON $TESTTMP/show_mode.py ro $ "$PYTHON" $TESTTMP/show_mode.py ro
ro:0644 ro:0644
# The file which was read-only is now writable in the default behavior # The file which was read-only is now writable in the default behavior
Check behavior with update.atomic-files Check behavior with update.atomic-files
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [experimental] > [experimental]
> update.atomic-file = true > update.atomic-file = true
> EOF > EOF
$ hg update -C -r 0 -q $ hg update -C -r 0 -q
$ hg update -r 1 --config extensions.showwrites=.hg/showwrites.py 2>&1 | grep "a1'.*wb" $ hg update -r 1 --config extensions.showwrites=.hg/showwrites.py 2>&1 | grep "a1'.*wb"
('vfs open', ('a1', 'wb'), [('atomictemp', True), ('backgroundclose', True)]) ('vfs open', ('a1', 'wb'), [('atomictemp', True), ('backgroundclose', True)])
$ hg st -A --rev 1 $ hg st -A --rev 1
C a1 C a1
C a2 C a2
C b1 C b1
C b2 C b2
C d C d
C ro C ro
Check the file permission after update Check the file permission after update
$ $PYTHON $TESTTMP/show_mode.py * $ "$PYTHON" $TESTTMP/show_mode.py *
a1:0644 a1:0644
a2:0755 a2:0755
b1:0644 b1:0644
b2:0755 b2:0755
d:0644 d:0644
ro:0644 ro:0644
Manually reset the mode of the read-only file Manually reset the mode of the read-only file
$ chmod a-w ro $ chmod a-w ro
$ $PYTHON $TESTTMP/show_mode.py ro $ "$PYTHON" $TESTTMP/show_mode.py ro
ro:0444 ro:0444
Now the file is present, try to update and check the permissions of the file Now the file is present, try to update and check the permissions of the file
$ hg update -r 2 --traceback $ hg update -r 2 --traceback
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ $PYTHON $TESTTMP/show_mode.py ro $ "$PYTHON" $TESTTMP/show_mode.py ro
ro:0644 ro:0644
# The behavior is the same as without atomic update # The behavior is the same as without atomic update

tests/test-verify-repo-operations.py

# previously been created that has the same name as an ancestor # previously been created that has the same name as an ancestor
# of the current path. This will cause mkdirp to fail with this # of the current path. This will cause mkdirp to fail with this
# error. We just turn this into a no-op in that case. # error. We just turn this into a no-op in that case.
return return
with open(path, 'wb') as o: with open(path, 'wb') as o:
o.write(content) o.write(content)
self.log.append( self.log.append(
( (
"$ $PYTHON -c 'import binascii; " "$ \"$PYTHON\" -c 'import binascii; "
"print(binascii.unhexlify(\"%s\"))' > %s" "print(binascii.unhexlify(\"%s\"))' > %s"
) )
% ( % (
binascii.hexlify(content), binascii.hexlify(content),
pipes.quote(path), pipes.quote(path),
) )
) )