This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11251

test-nointerrupt: make "sure" the handler "might" trigger (issue6558)
ClosedPublic

Authored by marmoute on Aug 4 2021, 6:37 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG8892f604e242: test-nointerrupt: make "sure" the handler "might" trigger (issue6558)
Summary

We are sure that the signal got sent in the right time frame, however, we still
have race, so either the code is actually buggy or we need some security to make
sure the signal get processed.

We might be affected by https://bugs.python.org/issue43406 ?

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

marmoute created this revision.Aug 4 2021, 6:37 AM
Alphare added a subscriber: Alphare.Aug 5 2021, 3:22 AM

Has this resulted in the flakiness disappearing (at least as far as you can tell)?

marmoute added a comment.Aug 5 2021, 6:17 AM
In D11251#172709, @Alphare wrote:

Has this resulted in the flakiness disappearing (at least as far as you can tell)?

as far as I could tell.

Alphare accepted this revision.Aug 5 2021, 12:03 PM

That's pretty sad, but it's still arguably a better state than before.

This revision is now accepted and ready to land.Aug 5 2021, 12:03 PM

Revision Contents
Changeset List

PathPackages
Mtests/test-nointerrupt.t (3 lines)

Diff 29805

tests/test-nointerrupt.t

> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
> >
> @command(b'wait-signal', [], _(b'SYNC_FILE DONE_FILE'), norepo=True) > @command(b'wait-signal', [], _(b'SYNC_FILE DONE_FILE'), norepo=True)
> def sleep(ui, sync_file=b"$SYNC_FILE", done_file=b"$DONE_FILE", **opts): > def sleep(ui, sync_file=b"$SYNC_FILE", done_file=b"$DONE_FILE", **opts):
> start = time.time() > start = time.time()
> with ui.uninterruptible(): > with ui.uninterruptible():
> testing.write_file(sync_file, b'%d' % os.getpid()) > testing.write_file(sync_file, b'%d' % os.getpid())
> testing.wait_file(done_file) > testing.wait_file(done_file)
> # make sure we get rescheduled and the signal get a chance to be handled
> time.sleep(0.1)
> ui.warn(b"end of unsafe operation\n") > ui.warn(b"end of unsafe operation\n")
> ui.warn(b"%d second(s) passed\n" % int(time.time() - start)) > ui.warn(b"%d second(s) passed\n" % int(time.time() - start))
> EOF > EOF
$ cat > send-signal.sh << EOF $ cat > send-signal.sh << EOF
> #!/bin/sh > #!/bin/sh
> SIG=\$1 > SIG=\$1
> if [ -z "\$SIG" ]; then > if [ -z "\$SIG" ]; then
> echo "send-signal.sh requires one argument" >&2 > echo "send-signal.sh requires one argument" >&2
> exit 1 > exit 1
> fi > fi
> "$RUNTESTDIR/testlib/wait-on-file" 10 "$SYNC_FILE" || exit 2 > "$RUNTESTDIR/testlib/wait-on-file" 10 "$SYNC_FILE" || exit 2
> kill -s \$SIG \`cat "$SYNC_FILE"\` > kill -s \$SIG \`cat "$SYNC_FILE"\`
> sleep 1
> touch "$DONE_FILE" > touch "$DONE_FILE"
> EOF > EOF
#if no-windows #if no-windows
$ chmod +x send-signal.sh $ chmod +x send-signal.sh
#endif #endif
Kludge to emulate timeout(1) which is not generally available. Kludge to emulate timeout(1) which is not generally available.