From fb632e4f36ad204600c88406acd5d252c81d8bf1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 22 Sep 2016 01:11:36 +0100
Subject: Test suite: t-gbp-pushed-good: Refactor (nfc)

Provide various t-splitbrain-*.  These will be needed for tests of
--quilt=unapplied and --quilt=dpm.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 tests/lib | 53 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/tests/lib b/tests/lib
index ddef5f0..7c52788 100644
--- a/tests/lib
+++ b/tests/lib
@@ -566,7 +566,7 @@ t-pushed-good-core () {
 	git verify-tag `t-v-tag`
 }
 
-t-gbp-pushed-good--unpack () {
+t-splitbrain-pushed-good--unpack () {
 	cd $tmp
 	rm -rf t-unpack
 	mkdir t-unpack
@@ -580,21 +580,20 @@ t-gbp-pushed-good--unpack () {
 	git fetch ../../$p "refs/tags/*:refs/tags/*"
 }
 
-t-gbp-pushed-good--checkprep () {
+t-splitbrain-pushed-good--checkprep () {
 	git add -Af .
 	git rm --cached -r --ignore-unmatch .pc
 }
 
-t-gbp-pushed-good--checkdiff () {
+t-splitbrain-pushed-good--checkdiff () {
 	local tag=$1
-	t-gbp-pushed-good--checkprep
+	t-splitbrain-pushed-good--checkprep
 	t-output "" git diff --stat --cached $tag
 }
 
-t-gbp-pushed-good () {
-	local suite=${1:-sid}
-	local dep14tag=refs/tags/test-dummy/${v//\~/_}
-	local dgittag=$(t-v-tag)
+t-splitbrain-pushed-good-start () {
+	dep14tag=refs/tags/test-dummy/${v//\~/_}
+	dgittag=$(t-v-tag)
 	t-output "" git status --porcelain
 	t-ref-head
 	t-refs-same $dep14tag
@@ -606,8 +605,27 @@ t-gbp-pushed-good () {
 
 	t-incoming-dsc
 
-	t-gbp-pushed-good--unpack
-	t-gbp-pushed-good--checkdiff $dgittag
+	t-splitbrain-pushed-good--unpack
+	t-splitbrain-pushed-good--checkdiff $dgittag
+}
+t-splitbrain-pushed-good-end-made-dep14 () {
+	t-splitbrain-pushed-good--checkdiff $dep14tag
+	cd $tmp/$p
+}
+
+t-splitbrain-rm-gitignore-patch () {
+	perl -i -pe '
+		next unless $_ eq "auto-gitignore\n";
+		die if $counter++;
+		chomp;
+		rename "debian/patches/$_", "../t-auto-gitignore" or die $!;
+		$_ = "";
+	' debian/patches/series
+}
+
+t-gbp-pushed-good () {
+	local suite=${1:-sid}
+	t-splitbrain-pushed-good-start
 
 	# Right, now we want to check that the maintainer tree and
 	# the dgit tree differ in exactly the ways we expect.  We
@@ -615,20 +633,14 @@ t-gbp-pushed-good () {
 	# from the dgit tree.
 
 	# So, unpack it withut the patches applied
-	t-gbp-pushed-good--unpack --skip-patches
+	t-splitbrain-pushed-good--unpack --skip-patches
 
 	# dgit might have added a .gitignore patch, which we need to
 	# drop and remove
-	perl -i -pe '
-		next unless $_ eq "auto-gitignore\n";
-		die if $counter++;
-		chomp;
-		rename "debian/patches/$_", "../t-auto-gitignore" or die $!;
-		$_ = "";
-	' debian/patches/series
+	t-splitbrain-rm-gitignore-patch
 
 	# Now the result should differ only in non-debian/ .gitignores
-	t-gbp-pushed-good--checkprep
+	t-splitbrain-pushed-good--checkprep
 	git diff --cached --name-only $dep14tag >../changed
 	perl -ne '
 		next if !m#^debian/# && m#(^|/)\.gitignore#;
@@ -640,9 +652,8 @@ t-gbp-pushed-good () {
 	if [ -f ../t-auto-gitignore ]; then
 		patch --backup-if-mismatch -p1 -u <../t-auto-gitignore
 	fi
-	t-gbp-pushed-good--checkdiff $dep14tag
 
-	cd $tmp/$p
+	t-splitbrain-pushed-good-end-made-dep14
 }
 
 t-commit-build-push-expect-log () {
-- 
cgit v1.2.3