summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--tests/lib12
-rwxr-xr-xtests/setup/gdr-convert-gbp3
-rwxr-xr-xtests/setup/gdr-convert-gbp-noarchive1
-rwxr-xr-xtests/tests/gdr-newupstream1
-rwxr-xr-xtests/tests/gdr-viagit1
6 files changed, 16 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index ad5e0fe..d166e85 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 bd06d20..f3fb0da 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 0b525c8..e523fd3 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 dfeea3b..1d6758b 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 cfa0052..ee987f5 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 644d2d4..a83e622 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