From c8cdfbd7dbe5f8ec6f9e01094aa3f21d64111408 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 20:00:30 +0100 Subject: [PATCH] test suite: gdr-import-nostitch: New test Generate this situation and check it's OK. Also check that the messages contain the expected hint. Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- tests/tests/gdr-import-nostitch | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100755 tests/tests/gdr-import-nostitch diff --git a/debian/tests/control b/debian/tests/control index 5949c802..aa785b29 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-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 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-nostitch b/tests/tests/gdr-import-nostitch new file mode 100755 index 00000000..9eeb94ee --- /dev/null +++ b/tests/tests/gdr-import-nostitch @@ -0,0 +1,22 @@ +#!/bin/bash +set -e +autoimport= +. tests/lib +. $troot/lib-gdr + +t-dependencies GDR + +t-tstunt-parsechangelog + +t-gdr-gbp-import-core + +git checkout master + +git tag -m synthetic debian/1.0-1 + +t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp \ + 2>&1 | tee ../convert-msg + +grep -e 'dgit --overwrite will be needed' ../convert-msg >/dev/null + +t-ok -- 2.30.2