From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 8 Aug 2019 11:32:16 +0000 (+0100)
Subject: test suite: Break out t-non-dgit-upload
X-Git-Tag: archive/debian/9.7~14
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6e18bd400b1759ac4200d52300faaa7516766706;p=dgit.git

test suite: Break out t-non-dgit-upload

No functional change.

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

diff --git a/tests/lib b/tests/lib
index c788744b..8392e79a 100644
--- a/tests/lib
+++ b/tests/lib
@@ -476,6 +476,19 @@ t-dgit () {
 '
 }
 
+t-non-dgit-upload () {
+	t-dgit -wgf build-source
+
+	cd ..
+	c=${p}_${v}_source.changes
+	debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
+	dput -c $tmp/dput.cf test-dummy $c
+
+	t-archive-process-incoming sid
+	t-git-next-date
+	cd $p
+}
+
 t-dgit-manpage () {
 	local section=$1
 	local page=$2
diff --git a/tests/lib-gdr b/tests/lib-gdr
index cda11df5..bf94fbae 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -260,17 +260,7 @@ t-nmu-upload-2 () {
 
 t-nmu-upload-3 () {
 	t-dch-commit-r
-
-	t-dgit -wgf build-source
-
-	cd ..
-	c=${p}_${v}_source.changes
-	debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
-	dput -c $tmp/dput.cf test-dummy $c
-
-	t-archive-process-incoming sid
-	t-git-next-date
-	cd $p
+	t-non-dgit-upload
 	git checkout master
 }