summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-07 00:13:50 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-07 11:18:18 +0100
commita8160dbbba4d95c84a742bd7f94afeae0f578da8 (patch)
treeb72c6046c716849fe728c85cf43ab42d77fdaf92 /tests
parent31ce46f54f9f8a6ead0105db68646277944b940d (diff)
test suite: tagupl: Test git-debpush --upstream=
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/tests/tagupl7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/tests/tagupl b/tests/tests/tagupl
index c7396c4..c626c08 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'