test suite: tagupl: Use git-debpush

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/tests/control b/debian/tests/control
index 0732e14d57b6d008a4f8a7b0c478a249c05e8ab2..30fba46acfc320b363e39529a3bb9d2c8a11466f 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -66,7 +66,7 @@ Restrictions: x-dgit-git-only
 
 Tests: tagupl
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl, git-debpush
 
 Tests: test-list-uptodate
 Tests-Directory: tests/tests

diff --git a/tests/tests/tagupl b/tests/tests/tagupl
index 8e0fc8d91c6c6cdab098cd977ebcc6087045ffe9..27dd973d7c0259911c01e930278429e16c99d1c3 100755 (executable)
--- a/tests/tests/tagupl
+++ b/tests/tests/tagupl
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies DEBORIG
+t-dependencies DEBORIG git-debpush
 
 t-debpolicy
 
@@ -25,17 +25,12 @@ git checkout -B master quilt-tip-2
 #xxx
 
 upstream=$(git rev-parse upstream/1.0~0)
-
-tagmessage="example release 1.0-1 for unstable
-
-wibble wibble
-
-[dgit distro=test-dummy split --quilt=gbp]
-[dgit please-upload upstream-tag=upstream/1.0 upstream=$upstream]"
-
 tagname=test-dummy/$v
 
-git tag -u Senatus  -s -m "$tagmessage" $tagname
+${DGIT_DEBPUSH_TEST-git debpush} \
+       --distro=test-dummy --quilt=gbp --no-push -u Senatus
+
+# xxx test pushing
 
 cd ..
 mkdir tagupl