diff options
Diffstat (limited to 'tests/test-progress.t')
| -rw-r--r-- | tests/test-progress.t | 82 |
1 files changed, 16 insertions, 66 deletions
diff --git a/tests/test-progress.t b/tests/test-progress.t index 5fa0a62..6fe1c1e 100644 --- a/tests/test-progress.t +++ b/tests/test-progress.t @@ -9,102 +9,53 @@ > total = loops > if opts.get('total', None): > total = int(opts.get('total')) - > nested = False - > if opts.get('nested', None): - > nested = True > loops = abs(loops) > > for i in range(loops): > ui.progress('loop', i, 'loop.%d' % i, 'loopnum', total) - > if opts.get('parallel'): - > ui.progress('other', i, 'other.%d' % i, 'othernum', total) - > if nested: - > for j in range(2): - > ui.progress('nested', j, 'nested.%d' % j, 'nestnum', 2) - > ui.progress('nested', None, 'nested.done', 'nestnum', 2) > ui.progress('loop', None, 'loop.done', 'loopnum', total) > > commands.norepo += " loop" > > cmdtable = { - > "loop": (loop, [('', 'total', '', 'override for total'), - > ('', 'nested', False, 'show nested results'), - > ('', 'parallel', False, 'show parallel sets of results'), - > ], + > "loop": (loop, [('', 'total', '', 'override for total')], > 'hg loop LOOPS'), > } > EOF - $ cp $HGRCPATH $HGRCPATH.orig $ echo "[extensions]" >> $HGRCPATH $ echo "progress=" >> $HGRCPATH $ echo "loop=`pwd`/loop.py" >> $HGRCPATH $ echo "[progress]" >> $HGRCPATH - $ echo "format = topic bar number" >> $HGRCPATH + $ echo "format = topic bar number" >> $HGRCPATH $ echo "assume-tty=1" >> $HGRCPATH $ echo "width=60" >> $HGRCPATH test default params, display nothing because of delay - $ hg -y loop 3 2>&1 | "$TESTDIR/filtercr.py" + $ hg -y loop 3 2>&1 | $TESTDIR/filtercr.py $ echo "delay=0" >> $HGRCPATH $ echo "refresh=0" >> $HGRCPATH test with delay=0, refresh=0 - $ hg -y loop 3 2>&1 | "$TESTDIR/filtercr.py" + $ hg -y loop 3 2>&1 | $TESTDIR/filtercr.py loop [ ] 0/3 loop [===============> ] 1/3 loop [===============================> ] 2/3 \r (esc) - -test nested short-lived topics (which shouldn't display with nestdelay): - - $ hg -y loop 3 --nested 2>&1 | \ - > python "$TESTDIR/filtercr.py" - - loop [ ] 0/3 - loop [===============> ] 1/3 - loop [===============================> ] 2/3 - \r (esc) - - - $ hg --config progress.changedelay=0 -y loop 3 --nested 2>&1 | \ - > python "$TESTDIR/filtercr.py" - - loop [ ] 0/3 - nested [ ] 0/2 - nested [======================> ] 1/2 - loop [===============> ] 1/3 - nested [ ] 0/2 - nested [======================> ] 1/2 - loop [===============================> ] 2/3 - nested [ ] 0/2 - nested [======================> ] 1/2 - \r (esc) - - -test two topics being printed in parallel (as when we're doing a local ---pull clone, where you get the unbundle and bundle progress at the -same time): - $ hg loop 3 --parallel 2>&1 | python "$TESTDIR/filtercr.py" - - loop [ ] 0/3 - loop [===============> ] 1/3 - loop [===============================> ] 2/3 - \r (esc) test refresh is taken in account - $ hg -y --config progress.refresh=100 loop 3 2>&1 | "$TESTDIR/filtercr.py" + $ hg -y --config progress.refresh=100 loop 3 2>&1 | $TESTDIR/filtercr.py test format options 1 $ hg -y --config 'progress.format=number topic item+2' loop 2 2>&1 \ - > | "$TESTDIR/filtercr.py" + > | $TESTDIR/filtercr.py 0/2 loop lo 1/2 loop lo @@ -113,7 +64,7 @@ test format options 1 test format options 2 $ hg -y --config 'progress.format=number item-3 bar' loop 2 2>&1 \ - > | "$TESTDIR/filtercr.py" + > | $TESTDIR/filtercr.py 0/2 p.0 [ ] 1/2 p.1 [=======================> ] @@ -122,7 +73,7 @@ test format options 2 test format options and indeterminate progress $ hg -y --config 'progress.format=number item bar' loop -- -2 2>&1 \ - > | "$TESTDIR/filtercr.py" + > | $TESTDIR/filtercr.py 0 loop.0 [ <=> ] 1 loop.1 [ <=> ] @@ -130,7 +81,7 @@ test format options and indeterminate progress make sure things don't fall over if count > total - $ hg -y loop --total 4 6 2>&1 | "$TESTDIR/filtercr.py" + $ hg -y loop --total 4 6 2>&1 | $TESTDIR/filtercr.py loop [ ] 0/4 loop [===========> ] 1/4 @@ -142,7 +93,7 @@ make sure things don't fall over if count > total test immediate progress completion - $ hg -y loop 0 2>&1 | "$TESTDIR/filtercr.py" + $ hg -y loop 0 2>&1 | $TESTDIR/filtercr.py test delay time estimates @@ -163,8 +114,7 @@ test delay time estimates > time.time = mocktime(int(os.environ.get('MOCKTIME', '11'))) > EOF - $ cp $HGRCPATH.orig $HGRCPATH - $ echo "[extensions]" >> $HGRCPATH + $ echo "[extensions]" > $HGRCPATH $ echo "mocktime=`pwd`/mocktime.py" >> $HGRCPATH $ echo "progress=" >> $HGRCPATH $ echo "loop=`pwd`/loop.py" >> $HGRCPATH @@ -173,7 +123,7 @@ test delay time estimates $ echo "delay=25" >> $HGRCPATH $ echo "width=60" >> $HGRCPATH - $ hg -y loop 8 2>&1 | python "$TESTDIR/filtercr.py" + $ hg -y loop 8 2>&1 | python $TESTDIR/filtercr.py loop [=========> ] 2/8 1m07s loop [===============> ] 3/8 56s @@ -183,7 +133,7 @@ test delay time estimates loop [=====================================> ] 7/8 12s \r (esc) - $ MOCKTIME=10000 hg -y loop 4 2>&1 | python "$TESTDIR/filtercr.py" + $ MOCKTIME=10000 hg -y loop 4 2>&1 | python $TESTDIR/filtercr.py loop [ ] 0/4 loop [=========> ] 1/4 8h21m @@ -191,7 +141,7 @@ test delay time estimates loop [==============================> ] 3/4 2h47m \r (esc) - $ MOCKTIME=1000000 hg -y loop 4 2>&1 | python "$TESTDIR/filtercr.py" + $ MOCKTIME=1000000 hg -y loop 4 2>&1 | python $TESTDIR/filtercr.py loop [ ] 0/4 loop [=========> ] 1/4 5w00d @@ -200,7 +150,7 @@ test delay time estimates \r (esc) - $ MOCKTIME=14000000 hg -y loop 4 2>&1 | python "$TESTDIR/filtercr.py" + $ MOCKTIME=14000000 hg -y loop 4 2>&1 | python $TESTDIR/filtercr.py loop [ ] 0/4 loop [=========> ] 1/4 1y18w @@ -209,7 +159,7 @@ test delay time estimates \r (esc) Time estimates should not fail when there's no end point: - $ hg -y loop -- -4 2>&1 | python "$TESTDIR/filtercr.py" + $ hg -y loop -- -4 2>&1 | python $TESTDIR/filtercr.py loop [ <=> ] 2 loop [ <=> ] 3 |