diff options
-rw-r--r-- | debian/tests/control | 2 | ||||
-rwxr-xr-x | tests/tests/gdr-unprocessable-hints | 33 |
2 files changed, 34 insertions, 1 deletions
diff --git a/debian/tests/control b/debian/tests/control index aa785b2..a909f10 100644 --- 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-import-nostitch 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 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 diff --git a/tests/tests/gdr-unprocessable-hints b/tests/tests/gdr-unprocessable-hints new file mode 100755 index 0000000..710d7c9 --- /dev/null +++ b/tests/tests/gdr-unprocessable-hints @@ -0,0 +1,33 @@ +#!/bin/bash +set -e +. tests/lib + +t-dependencies GDR + +t-tstunt-parsechangelog +t-setup-import gdr-convert-gbp + +cd $p + +b=gdr-unprocessable/origin + +git checkout $b +t-expect-fail E:'maybe you needed git-debrebase convert-from' \ +t-git-debrebase quick + +git update-ref refs/ffq-prev/heads/$b master +t-expect-fail E:'Consider git-debrebase scrap' \ +t-git-debrebase quick + +git update-ref -d refs/ffq-prev/heads/$b master +git update-ref refs/debrebase-last/heads/$b HEAD +t-expect-fail E:'Branch/history seems mangled' \ +t-git-debrebase quick +test "$(grep 'git-debrebase scrap' ../t.output)" = "" + +git update-ref refs/debrebase-last/heads/$b master +t-expect-fail E:'Branch/history mangled, and diverged' \ +t-git-debrebase quick +test "$(grep 'git-debrebase scrap' ../t.output)" = "" + +t-ok |