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.
--- 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.
--- a/tests/test-convert-bzr-treeroot.t Sat Aug 08 00:12:41 2015 -0700
+++ b/tests/test-convert-bzr-treeroot.t Sat Aug 22 10:22:12 2015 -0700
@@ -1,3 +1,4 @@
+#require bzr
$ . "$TESTDIR/bzr-definitions"
$ cat > treeset.py <<EOF
--- a/tests/test-convert-bzr.t Sat Aug 08 00:12:41 2015 -0700
+++ b/tests/test-convert-bzr.t Sat Aug 22 10:22:12 2015 -0700
@@ -1,3 +1,5 @@
+#require bzr
+
$ . "$TESTDIR/bzr-definitions"
create and rename on the same file in the same step