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

equal deleted inserted replaced

-:b4d7743e174a
+:0622d6e134fb
 $ unset HGTEST_JOBS
 $ unset HGTEST_TIMEOUT
 $ unset HGTEST_PORT
 $ unset HGTEST_SHELL
-Smoke test
+Smoke test with install
 ============
-$ run-tests.py $HGTEST_RUN_TESTS_PURE
+$ run-tests.py $HGTEST_RUN_TESTS_PURE -l
 # Ran 0 tests, 0 skipped, 0 warned, 0 failed.
+Define a helper to avoid the install step
+=============
+$ rt()
+> {
+>     run-tests.py --with-hg=`which hg` "$@"
+> }
 a succesful test
 =======================
 $ cat > test-success.t << EOF
 >   never happens (?)
 >   xyzzy
 >   nor this (?)
 > EOF
-$ run-tests.py --with-hg=`which hg`
+$ rt
 .
 # Ran 1 tests, 0 skipped, 0 warned, 0 failed.
 failing test
 ==================
 >>> 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
-$ run-tests.py --with-hg=`which hg`
+$ rt
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,4 +1,4 @@
 $ echo babar
 # Ran 3 tests, 0 skipped, 0 warned, 2 failed.
 python hash seed: * (glob)
 [1]
 test --xunit support
-$ run-tests.py --with-hg=`which hg` --xunit=xunit.xml
+$ rt --xunit=xunit.xml
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,4 +1,4 @@
 $ echo babar
 $ rm test-failure-unicode.t
 test for --retest
 ====================
-$ run-tests.py --with-hg=`which hg` --retest
+$ rt --retest
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,4 +1,4 @@
 $ echo babar
 Selecting Tests To Run
 ======================
 successful
-$ run-tests.py --with-hg=`which hg` test-success.t
+$ rt test-success.t
 .
 # Ran 1 tests, 0 skipped, 0 warned, 0 failed.
 success w/ keyword
-$ run-tests.py --with-hg=`which hg` -k xyzzy
+$ rt -k xyzzy
 .
 # Ran 2 tests, 1 skipped, 0 warned, 0 failed.
 failed
-$ run-tests.py --with-hg=`which hg` test-failure.t
+$ rt test-failure.t
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,4 +1,4 @@
 $ echo babar
 # Ran 1 tests, 0 skipped, 0 warned, 1 failed.
 python hash seed: * (glob)
 [1]
 failure w/ keyword
-$ run-tests.py --with-hg=`which hg` -k rataxes
+$ rt -k rataxes
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,4 +1,4 @@
 $ echo babar
 it's actually the same test being reported for failure twice.
 $ cat > test-serve-fail.t <<EOF
 >   $ echo 'abort: child process failed to start blah'
 > EOF
-$ run-tests.py --with-hg=`which hg` test-serve-fail.t
+$ rt test-serve-fail.t
 ERROR: test-serve-fail.t output changed
 !
 ERROR: test-serve-fail.t output changed
 !
 $ rm test-serve-fail.t
 Running In Debug Mode
 ======================
-$ run-tests.py --with-hg=`which hg` --debug 2>&1 | grep -v pwd
+$ rt --debug 2>&1 | grep -v pwd
 + echo *SALT* 0 0 (glob)
 *SALT* 0 0 (glob)
 + echo babar
 babar
 + echo *SALT* 4 0 (glob)
 ==============
 (duplicate the failing test to get predictable output)
 $ cp test-failure.t test-failure-copy.t
-$ run-tests.py --with-hg=`which hg` --jobs 2 test-failure*.t -n
+$ rt --jobs 2 test-failure*.t -n
 !!
 Failed test-failure*.t: output changed (glob)
 Failed test-failure*.t: output changed (glob)
 # Ran 2 tests, 0 skipped, 0 warned, 2 failed.
 python hash seed: * (glob)
 failures in parallel with --first should only print one failure
 >>> f = open('test-nothing.t', 'w')
 >>> f.write('foo\n' * 1024) and None
 >>> f.write('  $ sleep 1') and None
-$ run-tests.py --with-hg=`which hg` --jobs 2 --first
+$ rt --jobs 2 --first
 --- $TESTTMP/test-failure*.t (glob)
 +++ $TESTTMP/test-failure*.t.err (glob)
 @@ -1,4 +1,4 @@
 $ echo babar
 (backup the failing test)
 $ cp test-failure.t backup
 Refuse the fix
-$ echo 'n' | run-tests.py --with-hg=`which hg` -i
+$ echo 'n' | rt -i
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,4 +1,4 @@
 $ echo babar
 This is a noop statement so that
 this test is still more bytes than success.
 Interactive with custom view
-$ echo 'n' | run-tests.py --with-hg=`which hg` -i --view echo
+$ echo 'n' | rt -i --view echo
 $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err (glob)
 Accept this change? [n]* (glob)
 ERROR: test-failure.t output changed
 !.
 Failed test-failure.t: output changed
 python hash seed: * (glob)
 [1]
 View the fix
-$ echo 'y' | run-tests.py --with-hg=`which hg` --view echo
+$ echo 'y' | rt --view echo
 $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err (glob)
 ERROR: test-failure.t output changed
 !.
 Failed test-failure.t: output changed
 $ echo "  saved backup bundle to \$TESTTMP/foo.hg" >> test-failure.t
 $ echo "  $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t
 $ echo "  saved backup bundle to \$TESTTMP/foo.hg (glob)" >> test-failure.t
 $ echo "  $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t
 $ echo "  saved backup bundle to \$TESTTMP/*.hg (glob)" >> test-failure.t
-$ echo 'y' | run-tests.py --with-hg=`which hg` -i 2>&1 | \
+$ echo 'y' | rt -i 2>&1
->   sed -e 's,(glob)$,&<,g'
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,9 +1,9 @@
 $ echo babar
 +  babar
 This is a noop statement so that
 this test is still more bytes than success.
 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
 -  saved backup bundle to $TESTTMP/foo.hg
-+  saved backup bundle to $TESTTMP/foo.hg (glob)<
++  saved backup bundle to $TESTTMP/foo.hg* (glob)
 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
-saved backup bundle to $TESTTMP/foo.hg (glob)<
+saved backup bundle to $TESTTMP/foo.hg* (glob)
 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
 Accept this change? [n] ..
 # Ran 2 tests, 0 skipped, 0 warned, 0 failed.
 $ sed -e 's,(glob)$,&<,g' test-failure.t
 $ mv backup test-failure.t
 No Diff
 ===============
-$ run-tests.py --with-hg=`which hg` --nodiff
+$ rt --nodiff
 !.
 Failed test-failure.t: output changed
 # Ran 2 tests, 0 skipped, 0 warned, 1 failed.
 python hash seed: * (glob)
 [1]
 test --tmpdir support
-$ run-tests.py --with-hg=`which hg` --tmpdir=$TESTTMP/keep test-success.t
+$ rt --tmpdir=$TESTTMP/keep test-success.t
 Keeping testtmp dir: $TESTTMP/keep/child1/test-success.t (glob)
 Keeping threadtmp dir: $TESTTMP/keep/child1  (glob)
 .
 # Ran 1 tests, 0 skipped, 0 warned, 0 failed.
 >   $ echo pass
 >   pass
 > EOF
 > echo '#require slow' > test-slow-timeout.t
 > cat test-timeout.t >> test-slow-timeout.t
-$ run-tests.py --with-hg=`which hg` --timeout=1 --slowtimeout=3 \
+$ rt --timeout=1 --slowtimeout=3 test-timeout.t test-slow-timeout.t
-> test-timeout.t test-slow-timeout.t
 st
 Skipped test-slow-timeout.t: skipped
 Failed test-timeout.t: timed out
 # Ran 1 tests, 1 skipped, 0 warned, 1 failed.
 python hash seed: * (glob)
 [1]
-$ run-tests.py --with-hg=`which hg` --timeout=1 --slowtimeout=3 \
+$ rt --timeout=1 --slowtimeout=3 \
 > test-timeout.t test-slow-timeout.t --allow-slow-tests
 .t
 Failed test-timeout.t: timed out
 # Ran 2 tests, 0 skipped, 0 warned, 1 failed.
 python hash seed: * (glob)
 $ rm test-timeout.t test-slow-timeout.t
 test for --time
 ==================
-$ run-tests.py --with-hg=`which hg` test-success.t --time
+$ rt test-success.t --time
 .
 # Ran 1 tests, 0 skipped, 0 warned, 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
 ====================================
-$ run-tests.py --with-hg=`which hg` test-success.t --time --jobs 2
+$ rt test-success.t --time --jobs 2
 .
 # Ran 1 tests, 0 skipped, 0 warned, 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)
 ================
 $ cat > test-skip.t <<EOF
 >   $ echo xyzzy
 > #require false
 > EOF
-$ run-tests.py --with-hg=`which hg` --nodiff
+$ rt --nodiff
 !.s
 Skipped test-skip.t: skipped
 Failed test-failure.t: output changed
 # Ran 2 tests, 1 skipped, 0 warned, 1 failed.
 python hash seed: * (glob)
 [1]
-$ run-tests.py --with-hg=`which hg` --keyword xyzzy
+$ rt --keyword xyzzy
 .s
 Skipped test-skip.t: skipped
 # Ran 2 tests, 2 skipped, 0 warned, 0 failed.
 Skips with xml
-$ run-tests.py --with-hg=`which hg` --keyword xyzzy \
+$ rt --keyword xyzzy \
 >  --xunit=xunit.xml
 .s
 Skipped test-skip.t: skipped
 # Ran 2 tests, 2 skipped, 0 warned, 0 failed.
 $ cat xunit.xml
 <testcase name="test-success.t" time="*"/> (glob)
 </testsuite>
 Missing skips or blacklisted skips don't count as executed:
 $ echo test-failure.t > blacklist
-$ run-tests.py --with-hg=`which hg` --blacklist=blacklist \
+$ rt --blacklist=blacklist \
 >   test-failure.t test-bogus.t
 ss
 Skipped test-bogus.t: Doesn't exist
 Skipped test-failure.t: blacklisted
 # Ran 0 tests, 2 skipped, 0 warned, 0 failed.
 #if json
 test for --json
 ==================
-$ run-tests.py --with-hg=`which hg` --json
+$ rt --json
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,4 +1,4 @@
 $ echo babar
 } (no-eol)
 Test that failed test accepted through interactive are properly reported:
 $ cp test-failure.t backup
-$ echo y | run-tests.py --with-hg=`which hg` --json -i
+$ echo y | rt --json -i
 --- $TESTTMP/test-failure.t
 +++ $TESTTMP/test-failure.t.err
 @@ -1,4 +1,4 @@
 $ echo babar
 $ cat > test-glob-backslash.t << EOF
 >   $ echo 'foo bar \\'
 >   foo * \ (glob)
 > EOF
-$ run-tests.py --with-hg=`which hg` test-glob-backslash.t
+$ rt test-glob-backslash.t
 .
 # Ran 1 tests, 0 skipped, 0 warned, 0 failed.
 $ rm -f test-glob-backslash.t
 $ cat > test-hghave.t <<EOF
 > #require true
 >   $ echo foo
 >   foo
 > EOF
-$ run-tests.py $HGTEST_RUN_TESTS_PURE test-hghave.t
+$ rt $HGTEST_RUN_TESTS_PURE test-hghave.t
 .
 # Ran 1 tests, 0 skipped, 0 warned, 0 failed.
 test that RUNTESTDIR refers the directory, in which `run-tests.py` now
 running is placed.
 >   $ head -n 3 "\$RUNTESTDIR"/../contrib/check-code.py
 >   #!/usr/bin/env python
 >   #
 >   # check-code - a style and portability checker for Mercurial
 > EOF
-$ run-tests.py $HGTEST_RUN_TESTS_PURE test-runtestdir.t
+$ rt $HGTEST_RUN_TESTS_PURE test-runtestdir.t
 .
 # Ran 1 tests, 0 skipped, 0 warned, 0 failed.
 #if execbit
 $ chmod +x custom-command.sh
 $ cat > test-testdir-path.t <<EOF
 >   $ custom-command.sh
 >   hello world
 > EOF
-$ run-tests.py $HGTEST_RUN_TESTS_PURE test-testdir-path.t
+$ rt $HGTEST_RUN_TESTS_PURE test-testdir-path.t
 .
 # Ran 1 tests, 0 skipped, 0 warned, 0 failed.
 #endif
 $ cat > test-very-slow-test.t <<EOF
 > #require slow
 >   $ echo pass
 >   pass
 > EOF
-$ run-tests.py $HGTEST_RUN_TESTS_PURE test-very-slow-test.t
+$ rt $HGTEST_RUN_TESTS_PURE test-very-slow-test.t
 s
 Skipped test-very-slow-test.t: skipped
 # Ran 0 tests, 1 skipped, 0 warned, 0 failed.
-$ run-tests.py $HGTEST_RUN_TESTS_PURE --allow-slow-tests test-very-slow-test.t
+$ rt $HGTEST_RUN_TESTS_PURE --allow-slow-tests test-very-slow-test.t
 .
 # Ran 1 tests, 0 skipped, 0 warned, 0 failed.

changeset 27395	0622d6e134fb
parent 27393	a40b623e6380
child 27509	6ff90d618d72