From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 27 Jun 2018 20:41:38 +0000 (+0100)
Subject: test suite: gdr-viagit, gdr-newupstream: do not auto-import t-setup-gnupg.
X-Git-Tag: archive/debian/5.4~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3fbce7431379321c745f304c0f0134ae9b066701

test suite: gdr-viagit, gdr-newupstream: do not auto-import t-setup-gnupg.

We provide a new mechanism for individual tests to disable the
automatic t-setup-import of gnupg.

We need to add this to all the other setup/ that these import, too.
gdr-convert-gbp is particularly awkward because it wants gnupg if
$ifarchive isn't `:'.  There we arrange to suppress its automatic
inclusion, but add it again by hand if appropriate.

This fixes these two tests in chroots without gnupg.

Closes:#902559.

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

diff --git a/debian/changelog b/debian/changelog
index ad5e0fe9..d166e852 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dgit (5.4~) unstable; urgency=medium
     apropos of discussion in #902534.
 
   Bugfixes:
+  * test suite: gdr-viagit, gdr-newupstream: Do not spuriously
+    fail if gnupg not serendipitously installed.  Closes:#902559.
   * Fix bug ref to #865444 in previous changelog entry.
 
  --
diff --git a/tests/lib b/tests/lib
index bd06d20d..f3fb0dab 100644
--- a/tests/lib
+++ b/tests/lib
@@ -1134,7 +1134,11 @@ t-alt-test () {
 
 t-git-config dgit.default.old-dsc-distro test-dummy
 
-case "$0" in
-*/gnupg) ;;
-*)	t-setup-import gnupg	;;
-esac
+for import in ${autoimport-gnupg}; do
+	case "$0" in
+	*/$import) ;;
+	*)
+		t-setup-import $import
+		;;
+	esac
+done
diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index 0b525c87..e523fd33 100755
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -1,8 +1,11 @@
 #!/bin/bash
 set -e
+autoimport=
 . tests/lib
 . $troot/lib-gdr
 
+$ifarchive t-setup-import gnupg
+
 t-dependencies GDR
 
 t-tstunt-parsechangelog
diff --git a/tests/setup/gdr-convert-gbp-noarchive b/tests/setup/gdr-convert-gbp-noarchive
index dfeea3b9..1d6758b7 100755
--- a/tests/setup/gdr-convert-gbp-noarchive
+++ b/tests/setup/gdr-convert-gbp-noarchive
@@ -1,4 +1,5 @@
 #!/bin/bash
+autoimport=
 set -e
 . tests/lib
 . $troot/lib-gdr
diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream
index cfa00523..ee987f51 100755
--- a/tests/tests/gdr-newupstream
+++ b/tests/tests/gdr-newupstream
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+autoimport=
 . tests/lib
 
 t-dependencies NO-DGIT GDR
diff --git a/tests/tests/gdr-viagit b/tests/tests/gdr-viagit
index 644d2d45..a83e622b 100755
--- a/tests/tests/gdr-viagit
+++ b/tests/tests/gdr-viagit
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+autoimport=
 . tests/lib
 
 t-dependencies NO-DGIT GDR