From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 Jul 2016 14:57:01 +0000 (+0100)
Subject: Test suite: Provide t-gbp-example-prep [FOLD INTO QUILT-GBP TEST?]
X-Git-Tag: archive/debian/2.0~283
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=fa22d8f771e63ca6fc17dea716980aa0faaf8f2f

Test suite: Provide t-gbp-example-prep [FOLD INTO QUILT-GBP TEST?]

This function is useful for setting up a test case --quilt=gbp working
tree and corresponding archive contents, ready for substantive tests.
---

diff --git a/tests/lib b/tests/lib
index 0b883626..c51c4a61 100644
--- a/tests/lib
+++ b/tests/lib
@@ -534,6 +534,27 @@ t-gbp-unapplied-pq2qc () {
 	git checkout patch-queue/$branch
 }
 
+t-gbp-example-prep () {
+	t-archive example 1.0-1
+	t-git-none
+	t-worktree 1.0
+
+	cd example
+
+	t-dgit fetch
+
+	git-checkout -b patch-queue/quilt-tip-2 patch-queue/quilt-tip
+	gbp pq rebase
+
+	echo '/* some comment */' >>src.c
+	git add src.c
+	git commit -m 'Add a comment to an upstream file'
+
+	t-gbp-unapplied-pq2qc
+
+	t-commit 'some updates' 1.0-2
+}
+
 t-commit () {
 	local msg=$1
 	v=${2-1.$revision}