test suite: gdr-convert-gbp: test snag on unused patches

[dgit.git] / tests / setup / gdr-convert-gbp

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index b7e0b7d319e5fdaee837509b2fedbc9479c263d3..b563c01671358df3fd02446d60abde63e771c9ac 100755 (executable)
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -67,6 +67,10 @@ not-gdr-processable merge
 t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
 t-dch-commit-r
 
+echo garbage >debian/patches/garbage
+git add debian/patches/garbage
+git commit -m 'add garbage' debian/patches/garbage
+
 $ifarchive t-archive-none $p
 $ifarchive t-git-none
 $ifarchive t-dgit -wgf --gbp push-source --new
@@ -81,8 +85,16 @@ git push --set-upstream origin master
 #    debian/2.0-1                          archive/debian/2.0-1
 #    remotes/origin/master                 remotes/dgit/dgit/sid
 
+t-expect-fail E:'identical in upstream files' \
+t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~
+
+t-expect-fail E:'Unused patch file garbage will be discarded' \
 t-git-debrebase -fupstream-has-debian convert-from-gbp
 
+t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp
+
+git branch converted-from-gbp
+
 v=2.0-2
 t-dch-commit -v $v -m 'switch to git-debrebase, no other changes'
 t-dch-commit-r