test suite: Separate t-gdr-gbp-import-core from -with-queue

[dgit.git] / tests / tests / gdr-import-nostitch

diff --git a/tests/tests/gdr-import-nostitch b/tests/tests/gdr-import-nostitch
index 9eeb94eef751ebc4a17c63334badc84ab260dfda..c32b71e6f2efe514042d8b65b18a72105a8d5cc6 100755 (executable)
--- a/tests/tests/gdr-import-nostitch
+++ b/tests/tests/gdr-import-nostitch
@@ -8,13 +8,21 @@ t-dependencies GDR
 
 t-tstunt-parsechangelog
 
-t-gdr-gbp-import-core
+t-gdr-gbp-import-core-with-queue
 
 git checkout master
 
 git tag -m synthetic debian/1.0-1
 
-t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp \
+echo '# comment' >>debian/patches/series
+git add debian/patches/series
+git commit -m 'add a comment'
+
+t-expect-fail F:-fseries-comments \
+t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp
+
+t-git-debrebase -fupstream-has-debian -funused-patches -fseries-comments \
+  convert-from-gbp \
   2>&1 | tee ../convert-msg
 
 grep -e 'dgit --overwrite will be needed' ../convert-msg >/dev/null