mercurial: comparison tests/test-run-tests.t

equal deleted inserted replaced

-:96e50dfd8c94
+:1039404c5e1d
 $ . "$TESTDIR/helper-runtests.sh"
 Smoke test with install
 ============
 $ "$PYTHON" $TESTDIR/run-tests.py $HGTEST_RUN_TESTS_PURE -l
+running 0 tests using 0 parallel processes
 # Ran 0 tests, 0 skipped, 0 failed.
 Define a helper to avoid the install step
 =============
 #if symlink
 $ ln -s `which true` hg
 $ "$PYTHON" $TESTDIR/run-tests.py --with-hg=./hg
 warning: --with-hg should specify an hg script
+running 0 tests using 0 parallel processes
 # Ran 0 tests, 0 skipped, 0 failed.
 $ rm hg
 #endif
 an empty test
 =======================
 $ touch test-empty.t
 $ rt
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 $ rm test-empty.t
 a succesful test
 >   tsr (no-missing !)
 >   missing (missing !)
 > EOF
 $ rt
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 failing test
 ==================
 >   bar*bad (glob)
 >   bar*baz (glob)
 >   | fo (re)
 > EOF
 $ rt test-failure.t
+running 1 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,4 +1,4 @@
 $ echo "bar-baz"; echo "bar-bad"; echo foo
 >   value: * (glob)
 >   key: 4
 >   value: * (glob)
 > EOF
 $ rt test-failure-globs.t
+running 1 tests using 1 parallel processes
 --- $TESTTMP/test-failure-globs.t
 +++ $TESTTMP/test-failure-globs.t.err
 @@ -2,9 +2,9 @@
 context
 >   foo.ar (?)
 >   awol
 >   missing (?)
 > EOF
 $ rt test-failure.t
+running 1 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,11 +1,9 @@
 $ true
 >>> fh = open('test-failure-unicode.t', 'wb')
 >>> fh.write(u'  $ echo babar\u03b1\n'.encode('utf-8')) and None
 >>> fh.write(u'  l\u03b5\u03b5t\n'.encode('utf-8')) and None
 $ rt
+running 3 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,5 +1,5 @@
 $ echo babar
 [1]
 test --outputdir
 $ mkdir output
 $ rt --outputdir output
+running 3 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/output/test-failure.t.err
 @@ -1,5 +1,5 @@
 $ echo babar
 test-failure-unicode.t.err
 test-failure.t.err
 test --xunit support
 $ rt --xunit=xunit.xml
+running 3 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,5 +1,5 @@
 $ echo babar
 test for --retest
 ====================
 $ rt --retest
+running 2 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,5 +1,5 @@
 $ echo babar
 --retest works with --outputdir
 $ rm -r output
 $ mkdir output
 $ mv test-failure.t.err output
 $ rt --retest --outputdir output
+running 2 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/output/test-failure.t.err
 @@ -1,5 +1,5 @@
 $ echo babar
 ======================
 successful
 $ rt test-success.t
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 success w/ keyword
 $ rt -k xyzzy
+running 2 tests using 1 parallel processes
 .
 # Ran 2 tests, 1 skipped, 0 failed.
 failed
 $ rt test-failure.t
+running 1 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,5 +1,5 @@
 $ echo babar
 python hash seed: * (glob)
 [1]
 failure w/ keyword
 $ rt -k rataxes
+running 2 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,5 +1,5 @@
 $ echo babar
 $ cat > test-serve-fail.t <<EOF
 >   $ echo 'abort: child process failed to start blah'
 > EOF
 $ rt test-serve-fail.t
+running 1 tests using 1 parallel processes
 --- $TESTTMP/test-serve-fail.t
 +++ $TESTTMP/test-serve-fail.t.err
 @@ -1* +1,2 @@ (glob)
 $ echo 'abort: child process failed to start blah'
 $ cat > test-serve-inuse.t <<EOF
 >   $ hg serve -R `pwd`/inuse -p \$HGPORT -d --pid-file=hg.pid
 >   $ cat hg.pid >> \$DAEMON_PIDS
 > EOF
 $ rt test-serve-inuse.t
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 $ rm test-serve-inuse.t
 $ killdaemons.py $DAEMON_PIDS
 Running In Debug Mode
 ======================
 $ rt --debug 2>&1 | grep -v pwd
+running 2 tests using 1 parallel processes
 + echo *SALT* 0 0 (glob)
 *SALT* 0 0 (glob)
 + echo babar
 babar
 + echo *SALT* 10 0 (glob)
 (duplicate the failing test to get predictable output)
 $ cp test-failure.t test-failure-copy.t
 $ rt --jobs 2 test-failure*.t -n
+running 2 tests using 2 parallel processes
 !!
 Failed test-failure*.t: output changed (glob)
 Failed test-failure*.t: output changed (glob)
 # Ran 2 tests, 0 skipped, 2 failed.
 python hash seed: * (glob)
 [1]
 failures in parallel with --first should only print one failure
 $ rt --jobs 2 --first test-failure*.t
+running 2 tests using 2 parallel processes
 --- $TESTTMP/test-failure*.t (glob)
 +++ $TESTTMP/test-failure*.t.err (glob)
 @@ -1,5 +1,5 @@
 $ echo babar
 $ cp test-failure.t backup
 Refuse the fix
 $ echo 'n' | rt -i
+running 2 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,5 +1,5 @@
 $ echo babar
 pad pad pad pad............................................................
 Interactive with custom view
 $ echo 'n' | rt -i --view echo
+running 2 tests using 1 parallel processes
 $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err
 Accept this change? [n]* (glob)
 ERROR: test-failure.t output changed
 !.
 Failed test-failure.t: output changed
 [1]
 View the fix
 $ echo 'y' | rt --view echo
+running 2 tests using 1 parallel processes
 $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err
 ERROR: test-failure.t output changed
 !.
 Failed test-failure.t: output changed
 >   saved backup bundle to $TESTTMP\\foo.hg
 >   $ echo 'saved backup bundle to \$TESTTMP/foo.hg'
 >   saved backup bundle to \$TESTTMP/*.hg (glob)
 > EOF
 $ echo 'y' | rt -i 2>&1
+running 2 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,5 +1,5 @@
 $ echo babar
 >   $ echo 1
 >   $ echo "# a new line" >> $TESTRACEDIR/test-race.t
 > EOF
 $ rt -i test-race.t
+running 1 tests using 1 parallel processes
 --- $TESTTMP/test-race.t
 +++ $TESTTMP/test-race.t.err
 @@ -1,2 +1,3 @@
 $ echo 1
 $ cat <<EOF | rt -i test-cases.t 2>&1
 > y
 > y
 > EOF
+running 2 tests using 1 parallel processes
 --- $TESTTMP/test-cases.t
 +++ $TESTTMP/test-cases.t#a.err
 @@ -1,6 +1,7 @@
 #testcases a b
 >   $ echo $NAME
 >   A (a !)
 >   B (b !)
 > EOF
 $ rt test-cases.t
+running 2 tests using 1 parallel processes
 ..
 # Ran 2 tests, 0 skipped, 0 failed.
 When using multiple dimensions of "#testcases" in .t files
 >   $ echo yes
 >   no
 > #endif
 > EOF
 $ rt test-cases.t
+running 4 tests using 1 parallel processes
 ..
 --- $TESTTMP/test-cases.t
 +++ $TESTTMP/test-cases.t#b#c.err
 @@ -6,5 +6,5 @@
 #endif
 No Diff
 ===============
 $ rt --nodiff
+running 2 tests using 1 parallel processes
 !.
 Failed test-failure.t: output changed
 # Ran 2 tests, 0 skipped, 1 failed.
 python hash seed: * (glob)
 [1]
 test --tmpdir support
 $ rt --tmpdir=$TESTTMP/keep test-success.t
+running 1 tests using 1 parallel processes
 Keeping testtmp dir: $TESTTMP/keep/child1/test-success.t
 Keeping threadtmp dir: $TESTTMP/keep/child1
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 >   pass
 > EOF
 > echo '#require slow' > test-slow-timeout.t
 > cat test-timeout.t >> test-slow-timeout.t
 $ rt --timeout=1 --slowtimeout=3 test-timeout.t test-slow-timeout.t
+running 2 tests using 1 parallel processes
 st
 Skipped test-slow-timeout.t: missing feature: allow slow tests (use --allow-slow-tests)
 Failed test-timeout.t: timed out
 # Ran 1 tests, 1 skipped, 1 failed.
 python hash seed: * (glob)
 [1]
 $ rt --timeout=1 --slowtimeout=3 \
 > test-timeout.t test-slow-timeout.t --allow-slow-tests
+running 2 tests using 1 parallel processes
 .t
 Failed test-timeout.t: timed out
 # Ran 2 tests, 0 skipped, 1 failed.
 python hash seed: * (glob)
 [1]
 test for --time
 ==================
 $ rt test-success.t --time
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 # Producing time report
 start   end     cuser   csys    real      Test
 \s*[\d\.]{5}   \s*[\d\.]{5}   \s*[\d\.]{5}   \s*[\d\.]{5}   \s*[\d\.]{5}   test-success.t (re)
 test for --time with --job enabled
 ====================================
 $ rt test-success.t --time --jobs 2
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 # Producing time report
 start   end     cuser   csys    real      Test
 \s*[\d\.]{5}   \s*[\d\.]{5}   \s*[\d\.]{5}   \s*[\d\.]{5}   \s*[\d\.]{5}   test-success.t (re)
 > #if false
 > #require false
 > #endif
 > EOF
 $ rt --nodiff
+running 4 tests using 1 parallel processes
 !.s.
 Skipped test-skip.t: missing feature: nail clipper
 Failed test-failure.t: output changed
 # Ran 3 tests, 1 skipped, 1 failed.
 python hash seed: * (glob)
 [1]
 $ rm test-noskip.t
 $ rt --keyword xyzzy
+running 3 tests using 1 parallel processes
 .s
 Skipped test-skip.t: missing feature: nail clipper
 # Ran 2 tests, 2 skipped, 0 failed.
 Skips with xml
 $ rt --keyword xyzzy \
 >  --xunit=xunit.xml
+running 3 tests using 1 parallel processes
 .s
 Skipped test-skip.t: missing feature: nail clipper
 # Ran 2 tests, 2 skipped, 0 failed.
 $ cat xunit.xml
 <?xml version="1.0" encoding="utf-8"?>
 Missing skips or blacklisted skips don't count as executed:
 $ echo test-failure.t > blacklist
 $ rt --blacklist=blacklist --json\
 >   test-failure.t test-bogus.t
+running 2 tests using 1 parallel processes
 ss
 Skipped test-bogus.t: Doesn't exist
 Skipped test-failure.t: blacklisted
 # Ran 0 tests, 2 skipped, 0 failed.
 $ cat report.json
 Whitelist trumps blacklist
 $ echo test-failure.t > whitelist
 $ rt --blacklist=blacklist --whitelist=whitelist --json\
 >   test-failure.t test-bogus.t
+running 2 tests using 1 parallel processes
 s
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,5 +1,5 @@
 $ echo babar
 Ensure that --test-list causes only the tests listed in that file to
 be executed.
 $ echo test-success.t >> onlytest
 $ rt --test-list=onlytest
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 $ echo test-bogus.t >> anothertest
 $ rt --test-list=onlytest --test-list=anothertest
+running 2 tests using 1 parallel processes
 s.
 Skipped test-bogus.t: Doesn't exist
 # Ran 1 tests, 1 skipped, 0 failed.
 $ rm onlytest anothertest
 test for --json
 ==================
 $ rt --json
+running 3 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,5 +1,5 @@
 $ echo babar
 $ rm report.json
 $ rm -r output
 $ mkdir output
 $ rt --json --outputdir output
+running 3 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/output/test-failure.t.err
 @@ -1,5 +1,5 @@
 $ echo babar
 Test that failed test accepted through interactive are properly reported:
 $ cp test-failure.t backup
 $ echo y | rt --json -i
+running 3 tests using 1 parallel processes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,5 +1,5 @@
 $ echo babar
 >   $ echo 'foo bar \\'
 >   foo * \ (glob)
 > EOF
 $ rt test-glob-backslash.t
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 $ rm -f test-glob-backslash.t
 Add support for external test formatter
 =======================================
 $ CUSTOM_TEST_RESULT=basic_test_result "$PYTHON" $TESTDIR/run-tests.py --with-hg=`which hg` "$@" test-success.t test-failure.t
+running 2 tests using 1 parallel processes
 # Ran 2 tests, 0 skipped, 0 failed.
 ON_START! <__main__.TestSuite tests=[<__main__.TTest testMethod=test-failure.t>, <__main__.TTest testMethod=test-success.t>]>
 FAILURE! test-failure.t output changed
 SUCCESS! test-success.t
 > #require true
 >   $ echo foo
 >   foo
 > EOF
 $ rt test-hghave.t
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 test that RUNTESTDIR refers the directory, in which `run-tests.py` now
 running is placed.
 >   #!USRBINENVPY
 >   #
 >   # check-code - a style and portability checker for Mercurial
 > EOF
 $ rt test-runtestdir.t
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 #if execbit
 $ cat > test-testdir-path.t <<EOF
 >   $ custom-command.sh
 >   hello world
 > EOF
 $ rt test-testdir-path.t
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 #endif
 > #require slow
 >   $ echo pass
 >   pass
 > EOF
 $ rt test-very-slow-test.t
+running 1 tests using 1 parallel processes
 s
 Skipped test-very-slow-test.t: missing feature: allow slow tests (use --allow-slow-tests)
 # Ran 0 tests, 1 skipped, 0 failed.
 $ rt $HGTEST_RUN_TESTS_PURE --allow-slow-tests test-very-slow-test.t
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 support for running a test outside the current directory
 $ mkdir nonlocal
 $ cat > nonlocal/test-is-not-here.t << EOF
 >   $ echo pass
 >   pass
 > EOF
 $ rt nonlocal/test-is-not-here.t
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.
 support for automatically discovering test if arg is a folder
 $ mkdir tmp && cd tmp
 $ cd ..
 $ cp -R tmp tmpp
 $ cp tmp/test-uno.t test-solo.t
 $ rt tmp/ test-solo.t tmpp
+running 5 tests using 1 parallel processes
 .....
 # Ran 5 tests, 0 skipped, 0 failed.
 $ rm -rf tmp tmpp
 support for running run-tests.py from another directory
 >   important commando
 > EOF
 $ cd ..
 $ rt tmp/test-*.t
+running 2 tests using 1 parallel processes
 --- $TESTTMP/anothertests/tmp/test-folder-fail.t
 +++ $TESTTMP/anothertests/tmp/test-folder-fail.t.err
 @@ -1,2 +1,2 @@
 $ cat $TESTDIR/useful-file.sh
 >   $ echo pass
 >   fail
 > EOF
 $ hg ci -m 'bad'
 $ rt --known-good-rev=0 test-bisect.t
+running 1 tests using 1 parallel processes
 --- $TESTTMP/anothertests/bisect/test-bisect.t
 +++ $TESTTMP/anothertests/bisect/test-bisect.t.err
 @@ -1,4 +1,4 @@
 $ echo pass
 >     pass
 > EOF
 $ hg commit -Am dependent test-bisect-dependent.t
 $ rt --known-good-rev=0 test-bisect-dependent.t
+running 1 tests using 1 parallel processes
 --- $TESTTMP/anothertests/bisect-dependent/test-bisect-dependent.t
 +++ $TESTTMP/anothertests/bisect-dependent/test-bisect-dependent.t.err
 @@ -1,2 +1,2 @@
 $ tail -1 $TESTDIR/../bisect/test-bisect.t
 usage: run-tests.py [options] [tests]
 run-tests.py: error: --bisect-repo cannot be used without --known-good-rev
 [2]
 $ rt --known-good-rev=0 --bisect-repo=../bisect test-bisect-dependent.t
+running 1 tests using 1 parallel processes
 --- $TESTTMP/anothertests/bisect-dependent/test-bisect-dependent.t
 +++ $TESTTMP/anothertests/bisect-dependent/test-bisect-dependent.t.err
 @@ -1,2 +1,2 @@
 $ tail -1 $TESTDIR/../bisect/test-bisect.t
 > This is test case $f
 >   $ sleep 1
 > EOF
 > done
 $ rt -j 2
+running 5 tests using 2 parallel processes
 ....
 # Ran 5 tests, 0 skipped, 0 failed.
 skipped: unknown feature: notarealhghavefeature
 $ cd ..
 > #endif
 >   $ [ $V = D ]
 >   [1]
 > EOF
 $ rt
+running 3 tests using 1 parallel processes
 .
 --- $TESTTMP/anothertests/cases/test-cases-abc.t
 +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err
 @@ -7,7 +7,7 @@
 $ V=C
 [1]
 --restart works
 $ rt --restart
+running 2 tests using 1 parallel processes
 --- $TESTTMP/anothertests/cases/test-cases-abc.t
 +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err
 @@ -7,7 +7,7 @@
 $ V=C
 --restart works with outputdir
 $ mkdir output
 $ mv test-cases-abc.t#B.err output
 $ rt --restart --outputdir output
+running 2 tests using 1 parallel processes
 --- $TESTTMP/anothertests/cases/test-cases-abc.t
 +++ $TESTTMP/anothertests/cases/output/test-cases-abc.t#B.err
 @@ -7,7 +7,7 @@
 $ V=C
 >   $ dostuff
 >   In case B
 > #endif
 > EOF
 $ rt test-cases-ab.t
+running 2 tests using 1 parallel processes
 ..
 # Ran 2 tests, 0 skipped, 0 failed.
 Support running a specific test case
 $ rt "test-cases-abc.t#B"
+running 1 tests using 1 parallel processes
 --- $TESTTMP/anothertests/cases/test-cases-abc.t
 +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err
 @@ -7,7 +7,7 @@
 $ V=C
 [1]
 Support running multiple test cases in the same file
 $ rt test-cases-abc.t#B test-cases-abc.t#C
+running 2 tests using 1 parallel processes
 --- $TESTTMP/anothertests/cases/test-cases-abc.t
 +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err
 @@ -7,7 +7,7 @@
 $ V=C
 [1]
 Support ignoring invalid test cases
 $ rt test-cases-abc.t#B test-cases-abc.t#D
+running 1 tests using 1 parallel processes
 --- $TESTTMP/anothertests/cases/test-cases-abc.t
 +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err
 @@ -7,7 +7,7 @@
 $ V=C
 #testcases simple case-with-dashes casewith_-.chars
 $ echo $TESTCASE
 simple
 $ rt test-cases-advanced-cases.t
+running 3 tests using 1 parallel processes
 --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
 +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t#case-with-dashes.err
 @@ -1,3 +1,3 @@
 #testcases simple case-with-dashes casewith_-.chars
 # Ran 3 tests, 0 skipped, 2 failed.
 python hash seed: * (glob)
 [1]
 $ rt "test-cases-advanced-cases.t#case-with-dashes"
+running 1 tests using 1 parallel processes
 --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
 +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t#case-with-dashes.err
 @@ -1,3 +1,3 @@
 #testcases simple case-with-dashes casewith_-.chars
 # Ran 1 tests, 0 skipped, 1 failed.
 python hash seed: * (glob)
 [1]
 $ rt "test-cases-advanced-cases.t#casewith_-.chars"
+running 1 tests using 1 parallel processes
 --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
 +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t#casewith_-.chars.err
 @@ -1,3 +1,3 @@
 #testcases simple case-with-dashes casewith_-.chars
 >   last\$YYY$
 >   $ echo foo-bar foo-baz
 > EOF
 $ rt test-substitution.t
+running 1 tests using 1 parallel processes
 --- $TESTTMP/anothertests/cases/test-substitution.t
 +++ $TESTTMP/anothertests/cases/test-substitution.t.err
 @@ -7,3 +7,4 @@
 $ echo lastbar
 >   $ hg init test-config-opt
 >   $ hg -R test-config-opt purge
 > EOF
 $ rt --extra-config-opt extensions.purge= test-config-opt.t
+running 1 tests using 1 parallel processes
 .
 # Ran 1 tests, 0 skipped, 0 failed.

changeset 40244	1039404c5e1d
parent 39707	5abc47d4ca6b
child 40245	e7e70c033783