##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

largefiles: restore standins according to restored dirstate...
largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.
Matt Mackall - - Load All Authors

File last commit:

r22173:d3702a82 merge default
r22285:85bded43 default
Show More
test-run-tests.t
359 lines | 8.5 KiB | text/troff | Tads3Lexer
/ tests / test-run-tests.t
History | Source | Raw |Copy content |Copy permalink
Pierre-Yves David
test: introduce test-run-tests.t...
 r21732 This file tests the behavior of run-tests.py itself.
Smoke test
============
$ $TESTDIR/run-tests.py
# Ran 0 tests, 0 skipped, 0 warned, 0 failed.
Pierre-Yves David
test-run-tests.t: test running a passing test
 r21734
a succesful test
=======================
$ cat > test-success.t << EOF
> $ echo babar
> babar
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 > $ echo xyzzy
> xyzzy
Pierre-Yves David
test-run-tests.t: test running a passing test
 r21734 > EOF
$ $TESTDIR/run-tests.py --with-hg=`which hg`
.
# Ran 1 tests, 0 skipped, 0 warned, 0 failed.
Pierre-Yves David
test-run-tests.t: test running a failing test
 r21738
failing test
==================
$ cat > test-failure.t << EOF
> $ echo babar
> rataxes
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 > This is a noop statement so that
> this test is still more bytes than success.
Pierre-Yves David
test-run-tests.t: test running a failing test
 r21738 > EOF
$ $TESTDIR/run-tests.py --with-hg=`which hg`
Matt Mackall
test-run-tests: fix up slash/backslash on diff chunks for Windows
 r22172 --- $TESTTMP/test-failure.t (glob)
+++ $TESTTMP/test-failure.t.err (glob)
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 @@ -1,4 +1,4 @@
Pierre-Yves David
test-run-tests.t: test running a failing test
 r21738 $ echo babar
- rataxes
+ babar
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 This is a noop statement so that
this test is still more bytes than success.
Pierre-Yves David
test-run-tests.t: test running a failing test
 r21738
ERROR: test-failure.t output changed
!.
Failed test-failure.t: output changed
# Ran 2 tests, 0 skipped, 0 warned, 1 failed.
python hash seed: * (glob)
[1]
Augie Fackler
run-tests: add support for xunit test reports...
 r22044 test --xunit support
$ $TESTDIR/run-tests.py --with-hg=`which hg` --xunit=xunit.xml
--- $TESTTMP/test-failure.t
+++ $TESTTMP/test-failure.t.err
@@ -1,4 +1,4 @@
$ echo babar
- rataxes
+ babar
This is a noop statement so that
this test is still more bytes than success.
ERROR: test-failure.t output changed
!.
Failed test-failure.t: output changed
# Ran 2 tests, 0 skipped, 0 warned, 1 failed.
python hash seed: * (glob)
[1]
$ cat xunit.xml
<?xml version="1.0" encoding="utf-8"?>
<testsuite errors="0" failures="1" name="run-tests" skipped="0" tests="2">
<testcase name="test-success.t" time="*"/> (glob)
<testcase name="test-failure.t" time="*"> (glob)
<![CDATA[--- $TESTTMP/test-failure.t
+++ $TESTTMP/test-failure.t.err
@@ -1,4 +1,4 @@
$ echo babar
- rataxes
+ babar
This is a noop statement so that
this test is still more bytes than success.
]]> </testcase>
</testsuite>
Pierre-Yves David
test-run-tests.t: tests the --retest option
 r21741
test for --retest
====================
$ $TESTDIR/run-tests.py --with-hg=`which hg` --retest
Matt Mackall
test-run-tests: fix up slash/backslash on diff chunks for Windows
 r22172 --- $TESTTMP/test-failure.t (glob)
+++ $TESTTMP/test-failure.t.err (glob)
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 @@ -1,4 +1,4 @@
Pierre-Yves David
test-run-tests.t: tests the --retest option
 r21741 $ echo babar
- rataxes
+ babar
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 This is a noop statement so that
this test is still more bytes than success.
Pierre-Yves David
test-run-tests.t: tests the --retest option
 r21741
ERROR: test-failure.t output changed
!
Failed test-failure.t: output changed
Augie Fackler
run-tests: fix test result counts with --keyword specified or skips occurring...
 r21997 # Ran 2 tests, 1 skipped, 0 warned, 1 failed.
Pierre-Yves David
test-run-tests.t: tests the --retest option
 r21741 python hash seed: * (glob)
[1]
Pierre-Yves David
test-run-tests.t: test selection of testfile from the command line
 r21742
Selecting Tests To Run
======================
successful
$ $TESTDIR/run-tests.py --with-hg=`which hg` test-success.t
.
# Ran 1 tests, 0 skipped, 0 warned, 0 failed.
Augie Fackler
run-tests: fix test result counts with --keyword specified or skips occurring...
 r21997 success w/ keyword
$ $TESTDIR/run-tests.py --with-hg=`which hg` -k xyzzy
Matt Mackall
run-tests: don't show 'i' for tests that don't match a keyword
 r22107 .
# Ran 2 tests, 1 skipped, 0 warned, 0 failed.
Augie Fackler
run-tests: fix test result counts with --keyword specified or skips occurring...
 r21997
Pierre-Yves David
test-run-tests.t: test selection of testfile from the command line
 r21742 failed
$ $TESTDIR/run-tests.py --with-hg=`which hg` test-failure.t
Matt Mackall
test-run-tests: fix up slash/backslash on diff chunks for Windows
 r22172 --- $TESTTMP/test-failure.t (glob)
+++ $TESTTMP/test-failure.t.err (glob)
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 @@ -1,4 +1,4 @@
Pierre-Yves David
test-run-tests.t: test selection of testfile from the command line
 r21742 $ echo babar
- rataxes
+ babar
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 This is a noop statement so that
this test is still more bytes than success.
Pierre-Yves David
test-run-tests.t: test selection of testfile from the command line
 r21742
ERROR: test-failure.t output changed
!
Failed test-failure.t: output changed
# Ran 1 tests, 0 skipped, 0 warned, 1 failed.
python hash seed: * (glob)
[1]
Pierre-Yves David
test-run-tests.t: test --debug option
 r21743
Augie Fackler
run-tests: fix test result counts with --keyword specified or skips occurring...
 r21997 failure w/ keyword
$ $TESTDIR/run-tests.py --with-hg=`which hg` -k rataxes
Matt Mackall
run-tests: don't show 'i' for tests that don't match a keyword
 r22107
Augie Fackler
run-tests: fix test result counts with --keyword specified or skips occurring...
 r21997 --- $TESTTMP/test-failure.t
+++ $TESTTMP/test-failure.t.err
@@ -1,4 +1,4 @@
$ echo babar
- rataxes
+ babar
This is a noop statement so that
this test is still more bytes than success.
ERROR: test-failure.t output changed
!
Failed test-failure.t: output changed
Matt Mackall
run-tests: don't show 'i' for tests that don't match a keyword
 r22107 # Ran 2 tests, 1 skipped, 0 warned, 1 failed.
Augie Fackler
run-tests: fix test result counts with --keyword specified or skips occurring...
 r21997 python hash seed: * (glob)
[1]
Pierre-Yves David
test-run-tests.t: test --debug option
 r21743 Running In Debug Mode
======================
Matt Mackall
test-run-tests: fix stdout/stderr io ordering
 r22134 $ $TESTDIR/run-tests.py --with-hg=`which hg` --debug 2>&1 | grep -v pwd
Pierre-Yves David
test-run-tests.t: test --debug option
 r21743 + echo SALT* 0 0 (glob)
SALT* 0 0 (glob)
+ echo babar
babar
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 + echo SALT* 4 0 (glob)
SALT* 4 0 (glob)
Pierre-Yves David
test-run-tests.t: test --debug option
 r21743 .+ echo SALT* 0 0 (glob)
SALT* 0 0 (glob)
+ echo babar
babar
+ echo SALT* 2 0 (glob)
SALT* 2 0 (glob)
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 + echo xyzzy
xyzzy
+ echo SALT* 4 0 (glob)
SALT* 4 0 (glob)
Pierre-Yves David
test-run-tests.t: test --debug option
 r21743 .
# Ran 2 tests, 0 skipped, 0 warned, 0 failed.
Pierre-Yves David
test-run-tests.t: tests --jobs option
 r21744
Parallel runs
==============
(duplicate the failing test to get predictable output)
$ cp test-failure.t test-failure-copy.t
$ $TESTDIR/run-tests.py --with-hg=`which hg` --jobs 2 test-failure*.t
--- $TESTTMP/test-failure*.t (glob)
+++ $TESTTMP/test-failure*.t.err (glob)
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 @@ -1,4 +1,4 @@
Pierre-Yves David
test-run-tests.t: tests --jobs option
 r21744 $ echo babar
- rataxes
+ babar
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 This is a noop statement so that
this test is still more bytes than success.
Pierre-Yves David
test-run-tests.t: tests --jobs option
 r21744
ERROR: test-failure*.t output changed (glob)
!
--- $TESTTMP/test-failure*.t (glob)
+++ $TESTTMP/test-failure*.t.err (glob)
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 @@ -1,4 +1,4 @@
Pierre-Yves David
test-run-tests.t: tests --jobs option
 r21744 $ echo babar
- rataxes
+ babar
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 This is a noop statement so that
this test is still more bytes than success.
Pierre-Yves David
test-run-tests.t: tests --jobs option
 r21744
ERROR: test-failure*.t output changed (glob)
!
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)
[1]
(delete the duplicated test file)
$ rm test-failure-copy.t
Pierre-Yves David
test-run-tests.t: test the --interactive option
 r21755
Interactive run
===============
(backup the failing test)
$ cp test-failure.t backup
Refuse the fix
$ echo 'n' | $TESTDIR/run-tests.py --with-hg=`which hg` -i
--- $TESTTMP/test-failure.t
+++ $TESTTMP/test-failure.t.err
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 @@ -1,4 +1,4 @@
Pierre-Yves David
test-run-tests.t: test the --interactive option
 r21755 $ echo babar
- rataxes
+ babar
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 This is a noop statement so that
this test is still more bytes than success.
Matt Mackall
run-tests: hold iolock across diff/prompt when interactive...
 r21763 Accept this change? [n]
Pierre-Yves David
test-run-tests.t: test the --interactive option
 r21755 ERROR: test-failure.t output changed
Matt Mackall
run-tests: hold iolock across diff/prompt when interactive...
 r21763 !.
Pierre-Yves David
test-run-tests.t: test the --interactive option
 r21755 Failed test-failure.t: output changed
# Ran 2 tests, 0 skipped, 0 warned, 1 failed.
python hash seed: * (glob)
[1]
$ cat test-failure.t
$ echo babar
rataxes
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 This is a noop statement so that
this test is still more bytes than success.
Pierre-Yves David
test-run-tests.t: test the --interactive option
 r21755
Matt Mackall
test-run-tests: test --view
 r22108 View the fix
$ echo 'y' | $TESTDIR/run-tests.py --with-hg=`which hg` --view echo
$TESTTMP/test-failure.t $TESTTMP/test-failure.t.err
ERROR: test-failure.t output changed
!.
Failed test-failure.t: output changed
# Ran 2 tests, 0 skipped, 0 warned, 1 failed.
python hash seed: * (glob)
[1]
Pierre-Yves David
test-run-tests.t: test the --interactive option
 r21755
Accept the fix
$ echo 'y' | $TESTDIR/run-tests.py --with-hg=`which hg` -i
--- $TESTTMP/test-failure.t
+++ $TESTTMP/test-failure.t.err
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 @@ -1,4 +1,4 @@
Pierre-Yves David
test-run-tests.t: test the --interactive option
 r21755 $ echo babar
- rataxes
+ babar
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 This is a noop statement so that
this test is still more bytes than success.
Pierre-Yves David
test-run-tests.t: test the --interactive option
 r21755 Accept this change? [n] ..
# Ran 2 tests, 0 skipped, 0 warned, 0 failed.
$ cat test-failure.t
$ echo babar
babar
Augie Fackler
test-run-tests.t: add extra data to tests for keyword tests...
 r21995 This is a noop statement so that
this test is still more bytes than success.
Pierre-Yves David
test-run-tests.t: test the --interactive option
 r21755
(reinstall)
$ mv backup test-failure.t
Pierre-Yves David
test-run-tests.t: test the --nodiff option
 r21756
No Diff
===============
$ $TESTDIR/run-tests.py --with-hg=`which hg` --nodiff
!.
Failed test-failure.t: output changed
# Ran 2 tests, 0 skipped, 0 warned, 1 failed.
python hash seed: * (glob)
[1]
anuraggoel
run-tests: '--time' option provide more details to Linux users...
 r21977
test for --time
==================
$ $TESTDIR/run-tests.py --with-hg=`which hg` test-success.t --time
.
# Ran 1 tests, 0 skipped, 0 warned, 0 failed.
# Producing time report
cuser csys real Test
\s*[\d\.]{5} \s*[\d\.]{5} \s*[\d\.]{5} test-success.t (re)
test for --time with --job enabled
====================================
$ $TESTDIR/run-tests.py --with-hg=`which hg` test-success.t --time --jobs 2
.
# Ran 1 tests, 0 skipped, 0 warned, 0 failed.
# Producing time report
cuser csys real Test
\s*[\d\.]{5} \s*[\d\.]{5} \s*[\d\.]{5} test-success.t (re)
Augie Fackler
test-run-tests.t: add tests for skips...
 r21996
Skips
================
$ cat > test-skip.t <<EOF
> $ echo xyzzy
Matt Mackall
run-tests: add #require to abort full test...
 r22045 > #require false
Augie Fackler
test-run-tests.t: add tests for skips...
 r21996 > EOF
$ $TESTDIR/run-tests.py --with-hg=`which hg` --nodiff
!.s
Skipped test-skip.t: irrelevant
Failed test-failure.t: output changed
# Ran 2 tests, 1 skipped, 0 warned, 1 failed.
python hash seed: * (glob)
[1]
Augie Fackler
run-tests: fix test result counts with --keyword specified or skips occurring...
 r21997 $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy
Matt Mackall
run-tests: don't show 'i' for tests that don't match a keyword
 r22107 .s
Augie Fackler
run-tests: fix test result counts with --keyword specified or skips occurring...
 r21997 Skipped test-skip.t: irrelevant
Matt Mackall
run-tests: don't show 'i' for tests that don't match a keyword
 r22107 # Ran 2 tests, 2 skipped, 0 warned, 0 failed.
Augie Fackler
run-tests: fix test result counts with --keyword specified or skips occurring...
 r21997
Augie Fackler
run-tests: add support for xunit test reports...
 r22044 Skips with xml
$ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy \
> --xunit=xunit.xml
Matt Mackall
run-tests: don't show 'i' for tests that don't match a keyword
 r22107 .s
Augie Fackler
run-tests: add support for xunit test reports...
 r22044 Skipped test-skip.t: irrelevant
Matt Mackall
run-tests: don't show 'i' for tests that don't match a keyword
 r22107 # Ran 2 tests, 2 skipped, 0 warned, 0 failed.
Augie Fackler
run-tests: add support for xunit test reports...
 r22044 $ cat xunit.xml
<?xml version="1.0" encoding="utf-8"?>
Matt Mackall
run-tests: don't show 'i' for tests that don't match a keyword
 r22107 <testsuite errors="0" failures="0" name="run-tests" skipped="2" tests="2">
Augie Fackler
run-tests: add support for xunit test reports...
 r22044 <testcase name="test-success.t" time="*"/> (glob)
</testsuite>
Augie Fackler
run-tests: fix test result counts with --keyword specified or skips occurring...
 r21997 Missing skips or blacklisted skips don't count as executed:
$ echo test-failure.t > blacklist
$ $TESTDIR/run-tests.py --with-hg=`which hg` --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.