From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 6 Jul 2019 23:13:50 +0000 (+0100)
Subject: test suite: tagupl: Test git-debpush --upstream=
X-Git-Tag: archive/debian/9.1~9
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a8160dbbba4d95c84a742bd7f94afeae0f578da8

test suite: tagupl: Test git-debpush --upstream=

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

diff --git a/tests/tests/tagupl b/tests/tests/tagupl
index c7396c43..c626c08d 100755
--- a/tests/tests/tagupl
+++ b/tests/tests/tagupl
@@ -18,7 +18,8 @@ git checkout -b native
 git checkout --orphan upstream quilt-tip-2
 git rm -rf debian
 git commit -m 'pseudo-upstream'
-git tag upstream/1.0
+upstreamtag=UPSTREAM/RELEASE/1.0
+git tag $upstreamtag
 
 git checkout -B master quilt-tip-2
 
@@ -26,7 +27,7 @@ t-tagupl-settings
 
 tagname=test-dummy/$v
 
-t-tagupl-test --quilt=gbp
+t-tagupl-test --quilt=gbp --upstream=$upstreamtag
 
 # todo: test each miss/rejection
 
@@ -118,7 +119,7 @@ expect-email bupstag1 's/ upstream-tag=/$&:/' \
 	"failed command: git check-ref-format"
 
 expect-email bupstag2 's/ upstream-tag=/$&x/' \
-	"Couldn't find remote ref refs/tags/xupstream"
+	"Couldn't find remote ref refs/tags/xUPSTREAM"
 
 expect-email wrongver '' 'mismatch: changelog Version'