From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 10 Aug 2018 06:45:22 +0000 (+0100)
Subject: test suite: lib-gdr: Break out t-gdr-prep-new-upstream
X-Git-Tag: archive/debian/6.7~160
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=91c2126e5ab7bea38708933c9281c12c814bb200;hp=a676bb68111e13736dd58b4d08c754d6150e359e

test suite: lib-gdr: Break out t-gdr-prep-new-upstream

This does not include `git tag' for the upstream, because
gdr-newupstream wants to test the case where the tag is missing.

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 1bb810fe..849e3f64 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -291,3 +291,14 @@ t-nmu-reconciled-good () {
 	git checkout master
 	t-dgit -wgf quilt-fixup
 }
+
+t-gdr-prep-new-upstream () {
+	uv=$1
+	t-git-next-date
+	git checkout make-upstream
+	git reset --hard upstream
+	t-make-new-upstream-tarball $uv
+	git push . make-upstream:upstream
+	git checkout master
+	t-git-next-date
+}
diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream
index ada55168..0724459e 100755
--- a/tests/tests/gdr-newupstream
+++ b/tests/tests/gdr-newupstream
@@ -12,18 +12,7 @@ cd $p
 
 : 'upstream hat'
 
-new-upstream () {
-	uv=$1
-	t-git-next-date
-	git checkout make-upstream
-	git reset --hard upstream
-	t-make-new-upstream-tarball $uv
-	git push . make-upstream:upstream
-	git checkout master
-	t-git-next-date
-}
-
-new-upstream 2.1
+t-gdr-prep-new-upstream 2.1
 
 : 'maintainer hat'