This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3443

tests: remove pid file by default
ClosedPublic

Authored by indygreg on May 5 2018, 10:03 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG89793289c891: tests: remove pid file by default
Summary

Previously, killdaemons.py would kill PIDs listed in a file then
leave the file lingering around.

If the PIDs are killed, then there's no point leaving the PID file
around. In the worst case, a later invocation of killdaemons.py
(run-tests.py invokes killdaemons.py after running a test) could kill
a separate process whose PID conflicted with a previously-killed
process. By removing the PID file, we eliminate this possibility.

Some tests were manually removing the PID file after calling
killdaemons.py. So we update these tests to not do this.

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

indygreg created this revision.May 5 2018, 10:03 PM
Closed by commit rHG89793289c891: tests: remove pid file by default (authored by indygreg). · Explain WhyMay 6 2018, 8:20 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8473

tests/killdaemons.py

pass pass
if __name__ == '__main__': if __name__ == '__main__':
if len(sys.argv) > 1: if len(sys.argv) > 1:
path, = sys.argv[1:] path, = sys.argv[1:]
else: else:
path = os.environ["DAEMON_PIDS"] path = os.environ["DAEMON_PIDS"]
killdaemons(path) killdaemons(path, remove=True)

tests/test-lfs-test-server.t

$LOCALIP - - [$LOGDATE$] "GET /.hg/lfs/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 HTTP/1.1" 200 - (glob) $LOCALIP - - [$LOGDATE$] "GET /.hg/lfs/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 HTTP/1.1" 200 - (glob)
$LOCALIP - - [$LOGDATE$] "POST /.git/info/lfs/objects/batch HTTP/1.1" 200 - (glob) $LOCALIP - - [$LOGDATE$] "POST /.git/info/lfs/objects/batch HTTP/1.1" 200 - (glob)
$LOCALIP - - [$LOGDATE$] "GET /.hg/lfs/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b HTTP/1.1" 200 - (glob) $LOCALIP - - [$LOGDATE$] "GET /.hg/lfs/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b HTTP/1.1" 200 - (glob)
$LOCALIP - - [$LOGDATE$] "GET /.hg/lfs/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 HTTP/1.1" 200 - (glob) $LOCALIP - - [$LOGDATE$] "GET /.hg/lfs/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 HTTP/1.1" 200 - (glob)
$LOCALIP - - [$LOGDATE$] "GET /.hg/lfs/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 HTTP/1.1" 200 - (glob) $LOCALIP - - [$LOGDATE$] "GET /.hg/lfs/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 HTTP/1.1" 200 - (glob)
$LOCALIP - - [$LOGDATE$] "POST /.git/info/lfs/objects/batch HTTP/1.1" 200 - (glob) $LOCALIP - - [$LOGDATE$] "POST /.git/info/lfs/objects/batch HTTP/1.1" 200 - (glob)
#endif #endif
$ rm $DAEMON_PIDS
$ mkdir $TESTTMP/lfs-server2 $ mkdir $TESTTMP/lfs-server2
$ cd $TESTTMP/lfs-server2 $ cd $TESTTMP/lfs-server2
#if no-windows git-server #if no-windows git-server
$ lfs-test-server &> lfs-server.log & $ lfs-test-server &> lfs-server.log &
$ echo $! >> $DAEMON_PIDS $ echo $! >> $DAEMON_PIDS
#endif #endif
#if windows git-server #if windows git-server

tests/test-obsolete.t

68:c15e9edfca13 (draft) [tip ] add celestine 68:c15e9edfca13 (draft) [tip ] add celestine
reenable for later test reenable for later test
$ echo '[experimental]' >> $HGRCPATH $ echo '[experimental]' >> $HGRCPATH
$ echo "evolution.exchange=True" >> $HGRCPATH $ echo "evolution.exchange=True" >> $HGRCPATH
$ echo "evolution.createmarkers=True" >> $HGRCPATH $ echo "evolution.createmarkers=True" >> $HGRCPATH
$ rm hg.pid access.log errors.log $ rm access.log errors.log
#endif #endif
Several troubles on the same changeset (create an unstable and bumped changeset) Several troubles on the same changeset (create an unstable and bumped changeset)
$ hg debugobsolete `getid obsolete_e` $ hg debugobsolete `getid obsolete_e`
obsoleted 1 changesets obsoleted 1 changesets
2 new orphan changesets 2 new orphan changesets
$ hg debugobsolete `getid original_c` `getid babar` $ hg debugobsolete `getid original_c` `getid babar`

tests/test-run-tests.t

> $ hg serve -R `pwd`/inuse -p \$HGPORT -d --pid-file=hg.pid > $ hg serve -R `pwd`/inuse -p \$HGPORT -d --pid-file=hg.pid
> $ cat hg.pid >> \$DAEMON_PIDS > $ cat hg.pid >> \$DAEMON_PIDS
> EOF > EOF
$ rt test-serve-inuse.t $ rt test-serve-inuse.t
. .
# Ran 1 tests, 0 skipped, 0 failed. # Ran 1 tests, 0 skipped, 0 failed.
$ rm test-serve-inuse.t $ rm test-serve-inuse.t
$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
$ rm $DAEMON_PIDS
Running In Debug Mode Running In Debug Mode
====================== ======================
$ rt --debug 2>&1 | grep -v pwd $ rt --debug 2>&1 | grep -v pwd
+ echo *SALT* 0 0 (glob) + echo *SALT* 0 0 (glob)
*SALT* 0 0 (glob) *SALT* 0 0 (glob)
+ echo babar + echo babar

tests/test-serve.t

#require serve #require serve
$ hgserve() $ hgserve()
> { > {
> hg serve -a localhost -d --pid-file=hg.pid -E errors.log -v $@ \ > hg serve -a localhost -d --pid-file=hg.pid -E errors.log -v $@ \
> | sed -e "s/:$HGPORT1\\([^0-9]\\)/:HGPORT1\1/g" \ > | sed -e "s/:$HGPORT1\\([^0-9]\\)/:HGPORT1\1/g" \
> -e "s/:$HGPORT2\\([^0-9]\\)/:HGPORT2\1/g" \ > -e "s/:$HGPORT2\\([^0-9]\\)/:HGPORT2\1/g" \
> -e 's/http:\/\/[^/]*\//http:\/\/localhost\//' > -e 's/http:\/\/[^/]*\//http:\/\/localhost\//'
> cat hg.pid >> "$DAEMON_PIDS" > if [ -f hg.pid ]; then
> killdaemons.py hg.pid
> fi
> echo % errors > echo % errors
> cat errors.log > cat errors.log
> killdaemons.py hg.pid
> } > }
$ hg init test $ hg init test
$ cd test $ cd test
$ echo '[web]' > .hg/hgrc $ echo '[web]' > .hg/hgrc
$ echo 'accesslog = access.log' >> .hg/hgrc $ echo 'accesslog = access.log' >> .hg/hgrc
$ echo "port = $HGPORT1" >> .hg/hgrc $ echo "port = $HGPORT1" >> .hg/hgrc