This is an archive of the discontinued Mercurial Phabricator instance.

Differential D957

test-push-race: use 'ui.atexit' instead of python's 'atexit'
ClosedPublic

Authored by singhsrb on Oct 5 2017, 4:43 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHG30ae924a9e00: test-push-race: use 'ui.atexit' instead of python's 'atexit'
Summary

Callbacks registered with 'atexit' are sometimes not called (like when a
process is killed by the SIGTERM signal). Therefore, this commit replaces it
with 'ui.atexit' which ensures that the callbacks are always called. This also
makes the test compatible with chg.

Test Plan

Ran the test 'test-push-race.t' with and without the '--chg' option.

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

singhsrb created this revision.Oct 5 2017, 4:43 PM
singhsrb updated this revision to Diff 2472.Oct 5 2017, 4:44 PM

Removing the full-stop at the end of commit message.

singhsrb retitled this revision from test-push-race: use 'ui.atexit' instead of python's 'atexit'. to test-push-race: use 'ui.atexit' instead of python's 'atexit'.Oct 5 2017, 4:45 PM
singhsrb edited the summary of this revision. (Show Details)Oct 5 2017, 4:48 PM
singhsrb updated this revision to Diff 2475.

Updating to a more correct summary.

quark accepted this revision.Oct 5 2017, 6:35 PM
Closed by commit rHG30ae924a9e00: test-push-race: use 'ui.atexit' instead of python's 'atexit' (authored by singhsrb). · Explain WhyOct 7 2017, 9:20 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-push-race.t (3 lines)

Diff 2518

tests/test-push-race.t

A set of extension and shell functions ensures this scheduling. A set of extension and shell functions ensures this scheduling.
$ cat >> delaypush.py << EOF $ cat >> delaypush.py << EOF
> """small extension orchestrate push race > """small extension orchestrate push race
> >
> Client with the extensions will create a file when ready and get stuck until > Client with the extensions will create a file when ready and get stuck until
> a file is created.""" > a file is created."""
> >
> import atexit
> import errno > import errno
> import os > import os
> import time > import time
> >
> from mercurial import ( > from mercurial import (
> exchange, > exchange,
> extensions, > extensions,
> ) > )
> else: > else:
> # delete the file at the end of the push > # delete the file at the end of the push
> def delete(): > def delete():
> try: > try:
> os.unlink(watchpath) > os.unlink(watchpath)
> except OSError as exc: > except OSError as exc:
> if exc.errno != errno.ENOENT: > if exc.errno != errno.ENOENT:
> raise > raise
> atexit.register(delete) > ui.atexit(delete)
> return orig(pushop) > return orig(pushop)
> >
> def uisetup(ui): > def uisetup(ui):
> extensions.wrapfunction(exchange, '_pushbundle2', delaypush) > extensions.wrapfunction(exchange, '_pushbundle2', delaypush)
> EOF > EOF
$ waiton () { $ waiton () {
> # wait for a file to be created (then delete it) > # wait for a file to be created (then delete it)