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 f8957a09b60d6a88227a082f6fddf849e6efde72..a2c73dfaf18b798818b2c754aaf6a366c3a2f477 100644 (file)
--- 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 d2df2b84dba75ea3178be360ca0c1dea89728ed6..78b79e9b9bc74e1ba47c6d77a49c198b3074e8a5 100755 (executable)
--- 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