summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-06 14:29:46 +0100
committerSean Whitton <spwhitton@spwhitton.name>2019-07-07 09:54:19 +0100
commit9a5b14f4294318b8f11871ab5aad6d5afd849e0a (patch)
tree30b5425f32c9495f9132471367cc987b8e20d9c7
parentd5e73fceebd42c985264149bf1ae36ee4ebbee6e (diff)
test suite: tagupl: Use git-debpush
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/tests/control2
-rwxr-xr-xtests/tests/tagupl15
2 files changed, 6 insertions, 11 deletions
diff --git a/debian/tests/control b/debian/tests/control
index 0732e14..30fba46 100644
--- 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 8e0fc8d..27dd973 100755
--- 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