This is an archive of the discontinued Mercurial Phabricator instance.

Differential D844

test-patchbomb: use mocktime
ClosedPublic

Authored by quark on Sep 29 2017, 2:48 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG12b355964de8: test-patchbomb: use mocktime
rHGb4dbebdaf9e0: test-patchbomb: use mocktime
Summary

The test was using system time for displaying ETAs, which could be flaky if
the sysload is high. This patch extracts mocktime.py from test-progress.t to
make sure test-patchbomb.t is unaffected by system time.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Sep 29 2017, 2:48 PM
indygreg accepted this revision.Sep 29 2017, 2:56 PM
This revision is now accepted and ready to land.Sep 29 2017, 2:56 PM
Closed by commit rHGb4dbebdaf9e0: test-patchbomb: use mocktime (authored by quark). · Explain WhySep 29 2017, 2:58 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
AMtests/mocktime.py (18 lines)
Mtests/test-patchbomb.t (3 lines)
Mtests/test-progress.t (24 lines)

Diff 2163

tests/mocktime.py

  • This file was added.
from __future__ import absolute_import
import os
import time
class mocktime(object):
def __init__(self, increment):
self.time = 0
self.increment = [float(s) for s in increment.split()]
self.pos = 0
def __call__(self):
self.time += self.increment[self.pos % len(self.increment)]
self.pos += 1
return self.time
def uisetup(ui):
time.time = mocktime(os.environ.get('MOCKTIME', '0.1'))

tests/test-patchbomb.t

> __EOF__ > __EOF__
$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg email -n -t foo -s test -r 0:tip > /dev/null $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg email -n -t foo -s test -r 0:tip > /dev/null
$ cat .hg/last-email.txt $ cat .hg/last-email.txt
a precious introductory message a precious introductory message
$ hg email -m test.mbox -f quux -t foo -c bar -s test 0:tip \ $ hg email -m test.mbox -f quux -t foo -c bar -s test 0:tip \
> --config extensions.progress= --config progress.assume-tty=1 \ > --config extensions.progress= --config progress.assume-tty=1 \
> --config progress.delay=0 --config progress.refresh=0 \ > --config progress.delay=0 --config progress.refresh=0 \
> --config progress.width=60 > --config progress.width=60 \
> --config extensions.mocktime=$TESTDIR/mocktime.py
this patch series consists of 2 patches. this patch series consists of 2 patches.
Write the introductory message for the patch series. Write the introductory message for the patch series.
\r (no-eol) (esc) \r (no-eol) (esc)
sending [ ] 0/3\r (no-eol) (esc) sending [ ] 0/3\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)

tests/test-progress.t

test immediate progress completion test immediate progress completion
$ hg -y loop 0 $ hg -y loop 0
test delay time estimates test delay time estimates
#if no-chg #if no-chg
$ cat > mocktime.py <<EOF
> import os
> import time
>
> class mocktime(object):
> def __init__(self, increment):
> self.time = 0
> self.increment = [int(s) for s in increment.split()]
> self.pos = 0
> def __call__(self):
> self.time += self.increment[self.pos % len(self.increment)]
> self.pos += 1
> return self.time
>
> def uisetup(ui):
> time.time = mocktime(os.environ.get('MOCKTIME', '11'))
> EOF
$ cp $HGRCPATH.orig $HGRCPATH $ cp $HGRCPATH.orig $HGRCPATH
$ echo "[extensions]" >> $HGRCPATH $ echo "[extensions]" >> $HGRCPATH
$ echo "mocktime=`pwd`/mocktime.py" >> $HGRCPATH $ echo "mocktime=$TESTDIR/mocktime.py" >> $HGRCPATH
$ echo "progress=" >> $HGRCPATH $ echo "progress=" >> $HGRCPATH
$ echo "loop=`pwd`/loop.py" >> $HGRCPATH $ echo "loop=`pwd`/loop.py" >> $HGRCPATH
$ echo "[progress]" >> $HGRCPATH $ echo "[progress]" >> $HGRCPATH
$ echo "assume-tty=1" >> $HGRCPATH $ echo "assume-tty=1" >> $HGRCPATH
$ echo "delay=25" >> $HGRCPATH $ echo "delay=25" >> $HGRCPATH
$ echo "width=60" >> $HGRCPATH $ echo "width=60" >> $HGRCPATH
$ hg -y loop 8 $ MOCKTIME=11 hg -y loop 8
\r (no-eol) (esc) \r (no-eol) (esc)
loop [=========> ] 2/8 1m07s\r (no-eol) (esc) loop [=========> ] 2/8 1m07s\r (no-eol) (esc)
loop [===============> ] 3/8 56s\r (no-eol) (esc) loop [===============> ] 3/8 56s\r (no-eol) (esc)
loop [=====================> ] 4/8 45s\r (no-eol) (esc) loop [=====================> ] 4/8 45s\r (no-eol) (esc)
loop [==========================> ] 5/8 34s\r (no-eol) (esc) loop [==========================> ] 5/8 34s\r (no-eol) (esc)
loop [================================> ] 6/8 23s\r (no-eol) (esc) loop [================================> ] 6/8 23s\r (no-eol) (esc)
loop [=====================================> ] 7/8 12s\r (no-eol) (esc) loop [=====================================> ] 7/8 12s\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
loop [=============================> ] 15/20 3m38s\r (no-eol) (esc) loop [=============================> ] 15/20 3m38s\r (no-eol) (esc)
loop [===============================> ] 16/20 2m15s\r (no-eol) (esc) loop [===============================> ] 16/20 2m15s\r (no-eol) (esc)
loop [=================================> ] 17/20 1m27s\r (no-eol) (esc) loop [=================================> ] 17/20 1m27s\r (no-eol) (esc)
loop [====================================> ] 18/20 52s\r (no-eol) (esc) loop [====================================> ] 18/20 52s\r (no-eol) (esc)
loop [======================================> ] 19/20 25s\r (no-eol) (esc) loop [======================================> ] 19/20 25s\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
Time estimates should not fail when there's no end point: Time estimates should not fail when there's no end point:
$ hg -y loop -- -4 $ MOCKTIME=11 hg -y loop -- -4
\r (no-eol) (esc) \r (no-eol) (esc)
loop [ <=> ] 2\r (no-eol) (esc) loop [ <=> ] 2\r (no-eol) (esc)
loop [ <=> ] 3\r (no-eol) (esc) loop [ <=> ] 3\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
#endif #endif
test line trimming by '[progress] width', when progress topic contains test line trimming by '[progress] width', when progress topic contains