This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11205

test: remove `sleep` usage in `test-nointerrupt.t` (issue6271)
ClosedPublic

Authored by marmoute on Jul 20 2021, 9:45 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf48a688a7044: test: remove `sleep` usage in `test-nointerrupt.t` (issue6271)
Summary

We move from sleep based synchronisation to file creation based synchronisation.

Sleeps is the path to the dark side.
Sleeps leads to flakiness.
Flakiness leads to anger.
Anger leads to hate.
Hate leads to suffering.

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.Jul 20 2021, 9:45 PM
baymax updated this revision to Diff 29706.Jul 21 2021, 7:30 PM

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

Alphare accepted this revision.Jul 22 2021, 12:08 PM
Alphare added a subscriber: Alphare.

Does rhg still fail with this new mechanism? I'm assuming it does because nothing changed on its side, but we wouldn't want to lose the reproduction case.

This revision is now accepted and ready to land.Jul 22 2021, 12:08 PM

Revision Contents
Changeset List

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

Diff 29707

tests/test-nointerrupt.t

#require no-windows no-rhg #require no-windows no-rhg
XXX-RHG this test hangs if `hg` is really `rhg`. This was hidden by the use of XXX-RHG this test hangs if `hg` is really `rhg`. This was hidden by the use of
`alias hg=rhg` by run-tests.py. With such alias removed, this test is revealed `alias hg=rhg` by run-tests.py. With such alias removed, this test is revealed
buggy. This need to be resolved sooner than later. buggy. This need to be resolved sooner than later.
Dummy extension simulating unsafe long running command Dummy extension simulating unsafe long running command
$ cat > sleepext.py <<EOF $ SYNC_FILE="$TESTTMP/sync-file"
> import itertools $ export SYNC_FILE
$ DONE_FILE="$TESTTMP/done-file"
$ export DONE_FILE
$
$ cat > wait_ext.py <<EOF
> import os
> import time > import time
> >
> from mercurial.i18n import _ > from mercurial.i18n import _
> from mercurial import registrar > from mercurial import registrar
> from mercurial import testing
> >
> cmdtable = {} > cmdtable = {}
> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
> >
> @command(b'sleep', [], _(b'TIME'), norepo=True) > @command(b'wait-signal', [], _(b'SYNC_FILE DONE_FILE'), norepo=True)
> def sleep(ui, sleeptime=b"1", **opts): > def sleep(ui, sync_file=b"$SYNC_FILE", done_file=b"$DONE_FILE", **opts):
> start = time.time()
> with ui.uninterruptible(): > with ui.uninterruptible():
> for _i in itertools.repeat(None, int(sleeptime)): > testing.write_file(sync_file, b'%d' % os.getpid())
> time.sleep(1) > testing.wait_file(done_file)
> ui.warn(b"end of unsafe operation\n") > ui.warn(b"end of unsafe operation\n")
> ui.warn(b"%s second(s) passed\n" % sleeptime) > ui.warn(b"%d second(s) passed\n" % int(time.time() - start))
> EOF > EOF
Kludge to emulate timeout(1) which is not generally available. $ cat > send-signal.sh << EOF
$ cat > timeout.py <<EOF > #!/bin/sh
> from __future__ import print_function > SIG=\$1
> import argparse > if [ -z "\$SIG" ]; then
> import signal > echo "send-signal.sh requires one argument" >&2
> import subprocess > exit 1
> import sys > fi
> import time > "$RUNTESTDIR/testlib/wait-on-file" 10 "$SYNC_FILE" || exit 2
> > kill -s \$SIG \`cat "$SYNC_FILE"\`
> ap = argparse.ArgumentParser() > touch "$DONE_FILE"
> ap.add_argument('-s', nargs=1, default='SIGTERM')
> ap.add_argument('duration', nargs=1, type=int)
> ap.add_argument('argv', nargs='*')
> opts = ap.parse_args()
> try:
> sig = int(opts.s[0])
> except ValueError:
> sname = opts.s[0]
> if not sname.startswith('SIG'):
> sname = 'SIG' + sname
> sig = getattr(signal, sname)
> proc = subprocess.Popen(opts.argv)
> time.sleep(opts.duration[0])
> proc.poll()
> if proc.returncode is None:
> proc.send_signal(sig)
> proc.wait()
> sys.exit(124)
> EOF > EOF
#if no-windows
$ chmod +x send-signal.sh
#endif
Kludge to emulate timeout(1) which is not generally available.
Set up repository Set up repository
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> sleepext = ../sleepext.py > wait_ext = $TESTTMP/wait_ext.py
> EOF > EOF
Test ctrl-c Test ctrl-c
$ "$PYTHON" $TESTTMP/timeout.py -s INT 1 hg sleep 2 $ rm -f $SYNC_FILE $DONE_FILE
$ sh -c "../send-signal.sh INT" &
$ hg wait-signal
interrupted! interrupted!
[124] [255]
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> nointerrupt = yes > nointerrupt = yes
> EOF > EOF
$ "$PYTHON" $TESTTMP/timeout.py -s INT 1 hg sleep 2 $ rm -f $SYNC_FILE $DONE_FILE
$ sh -c "../send-signal.sh INT" &
$ hg wait-signal
interrupted! interrupted!
[124] [255]
$ 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 $ rm -f $SYNC_FILE $DONE_FILE
$ sh -c "../send-signal.sh INT" &
$ hg wait-signal
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] [255]