From e5bae1c8621bb50925404c3ba70c83b037a5b74f Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Aug 2018 10:44:59 +0100
Subject: [PATCH 1/1] test suite: gdr-import-dgitview: New test for dgit dsc
 imports

So far this just tests the bugfixes I've just done.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog                |  1 +
 debian/tests/control            |  2 +-
 tests/tests/gdr-import-dgitview | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100755 tests/tests/gdr-import-dgitview

diff --git a/debian/changelog b/debian/changelog
index 742b752c..a64a06d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ dgit (6.5~) unstable; urgency=medium
   * dgit: Improve error message for unknown suite, to suggest -d.
   * git-debrebase: Properly reject bare dgit dsc imports
   * git-debrebase: Improve some error message formatting.
+  * test suite: gdr-import-dgitview: New test for dgit dsc imports.
 
  --
 
diff --git a/debian/tests/control b/debian/tests/control
index 8f7fd7d2..e3274f22 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-makepatches7 gdr-subcommands gdr-unprocessable
+Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import-dgitview 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-dgitview b/tests/tests/gdr-import-dgitview
new file mode 100755
index 00000000..84fc50c4
--- /dev/null
+++ b/tests/tests/gdr-import-dgitview
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+. tests/lib
+. $troot/lib-gdr
+
+t-dependencies GDR
+
+t-tstunt-parsechangelog
+
+t-archive example 1.0-1
+t-git-none
+
+t-dgit clone $p
+
+cd $p
+
+t-git-debrebase status
+
+t-expect-fail E:'bare dgit dsc import' \
+t-git-debrebase
+
+LC_MESSAGES=C t-git-debrebase status |tee ../bare-output
+grep 'bare dgit dsc import with no prior history' ../bare-output
+
+t-ok
-- 
2.30.2