Mercurial > hg
changeset 26066:89872688893f
tests: move '#require bzr' into .t files
The bzr tests are the only .t tests calling hghave (aside from the tests
testing hghave itself). This pattern is a one-off and prevents
desired refactors to how requirements checking is integrated into tests.
Use the convention used everywhere else.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 22 Aug 2015 10:22:12 -0700 |
| parents | dceaef70e410 |
| children | 8107c308ff22 |
| files | tests/bzr-definitions tests/test-convert-bzr-114.t tests/test-convert-bzr-directories.t tests/test-convert-bzr-ghosts.t tests/test-convert-bzr-merges.t tests/test-convert-bzr-treeroot.t tests/test-convert-bzr.t |
| diffstat | 7 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/bzr-definitions Sat Aug 08 00:12:41 2015 -0700 +++ b/tests/bzr-definitions Sat Aug 22 10:22:12 2015 -0700 @@ -1,7 +1,5 @@ # this file holds the definitions that are used in various bzr tests -"$TESTDIR/hghave" bzr || exit 80 - TERM=dumb; export TERM echo '[extensions]' >> $HGRCPATH echo 'convert = ' >> $HGRCPATH
--- a/tests/test-convert-bzr-114.t Sat Aug 08 00:12:41 2015 -0700 +++ b/tests/test-convert-bzr-114.t Sat Aug 22 10:22:12 2015 -0700 @@ -1,4 +1,4 @@ -#require bzr114 +#require bzr bzr114 $ . "$TESTDIR/bzr-definitions"
--- a/tests/test-convert-bzr-directories.t Sat Aug 08 00:12:41 2015 -0700 +++ b/tests/test-convert-bzr-directories.t Sat Aug 22 10:22:12 2015 -0700 @@ -1,3 +1,4 @@ +#require bzr $ . "$TESTDIR/bzr-definitions"
--- a/tests/test-convert-bzr-ghosts.t Sat Aug 08 00:12:41 2015 -0700 +++ b/tests/test-convert-bzr-ghosts.t Sat Aug 22 10:22:12 2015 -0700 @@ -1,3 +1,4 @@ +#require bzr $ . "$TESTDIR/bzr-definitions" $ cat > ghostcreator.py <<EOF
--- a/tests/test-convert-bzr-merges.t Sat Aug 08 00:12:41 2015 -0700 +++ b/tests/test-convert-bzr-merges.t Sat Aug 22 10:22:12 2015 -0700 @@ -1,3 +1,5 @@ +#require bzr + N.B. bzr 1.13 has a bug that breaks this test. If you see this test fail, check your bzr version. Upgrading to bzr 1.13.1 should fix it.