From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 17 Jul 2019 01:12:16 +0000 (+0100)
Subject: test suite: baredebian: Break up baredebian-test-core
X-Git-Tag: archive/debian/9.3~21
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6e3ae6feace306f2cadb58e610d6e985086228d3

test suite: baredebian: Break up baredebian-test-core

For a baredebian tag-to-upload test, we're going to want to replace
the push.

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

diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index 61db9722..557c051a 100644
--- a/tests/lib-baredebian
+++ b/tests/lib-baredebian
@@ -23,7 +23,7 @@ baredebian-test-minimum () {
 	t-dgit -wn --dgit-view-save=split.f1 --$quiltmode quilt-fixup
 }
 
-baredebian-test-core () {
+baredebian-test-core-prepush () {
 	tar --strip-components=1 -axf ../$origbase.tar.*
 	for comp in $xorigcomps; do
 		mkdir $comp
@@ -60,14 +60,18 @@ baredebian-test-core () {
 	t-ref-head
 	t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.b quilt-fixup
 	t-ref-head
+}
 
+baredebian-test-core-push () {
 	dpkg-buildpackage -uc -us --build=source
 	# ^ Do this by hand here not because we expect users to do this
 	#   (rather than dgit build), but so that we can check that our
 	#   output is the same as users are used to.
 
 	t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.p --new push
+}
 
+baredebian-test-core-postpush () {
 	git merge-base --is-ancestor HEAD     split.p
 	if [ "$uvtag" ]; then
 		git merge-base --is-ancestor $uvtag split.p
@@ -90,6 +94,12 @@ baredebian-test-core () {
 	t-splitbrain-pushed-good-end-made-dep14
 }
 
+baredebian-test-core () {
+	baredebian-test-core-prepush
+	baredebian-test-core-push
+	baredebian-test-core-postpush
+}
+
 baredebian-test () {
 	baredebian-test-vars
 	baredebian-test-minimum