test suite: gdr-import-nostitch: New test

Generate this situation and check it's OK.  Also check that the
messages contain the expected hint.

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

diff --git a/debian/tests/control b/debian/tests/control
index 5949c8020b8d28fdacd10f2d0d366074863e6b0d..aa785b29cf719fe61debe083bdfab47d5e2f5672 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -16,7 +16,7 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc
 Restrictions: x-dgit-intree-only x-dgit-git-only
 
-Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import-dgitview gdr-makepatches7 gdr-subcommands gdr-unprocessable
+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
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-debrebase, git-buildpackage, faketime
 

diff --git a/tests/tests/gdr-import-nostitch b/tests/tests/gdr-import-nostitch
new file mode 100755 (executable)
index 0000000..9eeb94e
--- /dev/null
+++ b/tests/tests/gdr-import-nostitch
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+autoimport=
+. tests/lib
+. $troot/lib-gdr
+
+t-dependencies GDR
+
+t-tstunt-parsechangelog
+
+t-gdr-gbp-import-core
+
+git checkout master
+
+git tag -m synthetic debian/1.0-1
+
+t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp \
+  2>&1 | tee ../convert-msg
+
+grep -e 'dgit --overwrite will be needed' ../convert-msg >/dev/null
+
+t-ok