From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 12:30:39 +0000 (+0000)
Subject: git-debrebase: test suite: gdr-import-dgit: introduce nmu-upload (nfc)
X-Git-Tag: archive/debian/5.0~180
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a04c715cb3760cdc51f952e199381297ce3e7d4f;p=dgit.git

git-debrebase: test suite: gdr-import-dgit: introduce nmu-upload (nfc)

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

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index a9a31877..2d77d430 100755
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -12,21 +12,25 @@ cd $p
 
 git checkout -b nmu
 
-v=2.0-2+num1
-t-dch-commit -v $v -m nmu
+nmu-upload () {
+	t-dch-commit -v $v -m nmu
+
+	t-some-changes nmu
 
-t-some-changes nmu
+	t-dch-commit -r sid
 
-t-dch-commit -r sid
+	t-dgit -wgf build-source
 
-t-dgit -wgf build-source
+	cd ..
+	c=${p}_${v}_source.changes
+	debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
+	dput -c $tmp/dput.cf test-dummy $c
 
-cd ..
-c=${p}_${v}_source.changes
-debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
-dput -c $tmp/dput.cf test-dummy $c
+	t-archive-process-incoming sid
+}
 
-t-archive-process-incoming sid
+v=2.0-2+num1
+nmu-upload
 
 : 'done the nmu, switching back to the maintainer hat'