test suite: gdr-import-dgitview: Actually test convert-from-dgitview

This was always my intention with this test, of course.

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

diff --git a/tests/tests/gdr-import-dgitview b/tests/tests/gdr-import-dgitview
index 84fc50c4f600fda882e90e652674c5159af67d2c..3670deb373438da89afe1f0b7cd43b1c3cc48679 100755 (executable)
--- a/tests/tests/gdr-import-dgitview
+++ b/tests/tests/gdr-import-dgitview
@@ -22,4 +22,24 @@ t-git-debrebase
 LC_MESSAGES=C t-git-debrebase status |tee ../bare-output
 grep 'bare dgit dsc import with no prior history' ../bare-output
 
+git branch before
+
+t-expect-fail E:'Could not find or construct a suitable upstream commit' \
+t-git-debrebase convert-from-dgit-view --no-origs
+
+t-git-debrebase convert-from-dgit-view
+t-gdr-good laundered
+
+t-expect-fail E:'already seems to be in git-debrebase format' \
+t-git-debrebase convert-from-dgit-view
+
+t-refs-same-start
+t-ref-head
+t-git-debrebase --noop-ok convert-from-dgit-view
+t-ref-head
+
+t-git-debrebase convert-from-dgit-view --always-convert-anyway
+t-expect-fail E:'ref varies' t-ref-head
+t-gdr-good laundered
+
 t-ok