From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 25 Aug 2018 11:32:54 +0000 (+0100)
Subject: test suite: Test dgit branch_is_gdr walker on a merge resolution
X-Git-Tag: archive/debian/6.10~51
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=1f8626d4eaf79e8f26f0e27ff076fd5469a7cbe4

test suite: Test dgit branch_is_gdr walker on a merge resolution

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

diff --git a/debian/tests/control b/debian/tests/control
index f8957a09..a2c73dfa 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -20,11 +20,11 @@ Tests: gdr-merge-conflicts
 Tests-Directory: tests/tests
 Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime, quilt
 
-Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
+Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-merge gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-debrebase, git-buildpackage, faketime
 
-Tests: gdr-merge gdr-newupstream gdr-viagit
+Tests: gdr-newupstream gdr-viagit
 Tests-Directory: tests/tests
 Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime
 
diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index d2df2b84..78b79e9b 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -3,7 +3,7 @@ set -e
 autoimport=
 . tests/lib
 
-t-dependencies NO-DGIT GDR
+t-dependencies GDR
 
 t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp-noarchive
@@ -59,4 +59,7 @@ t-some-changes after
 t-git-debrebase
 t-gdr-good laundered
 
+t-dgit quilt-fixup
+t-gdr-made-patches
+
 t-ok