Bug#902559: some tests can fail if gnupg happens not to be installed
Hello, On Thu, Jun 28 2018, Ian Jackson wrote: > Did you also fix "#902578: dgit: missing seperator ..." in your > backport ? 5.2 has that bug. I did. Since the fix is so trivial, I didn't forward a patch or anything. -- Sean Whitton signature.asc Description: PGP signature
Bug#902559: some tests can fail if gnupg happens not to be installed
Sean Whitton writes ("Bug#902559: some tests can fail if gnupg happens not to
be installed"):
> On Wed, Jun 27 2018, Ian Jackson wrote:
> > Here is a better patch. This has passed more tests. If all is well I
> > will upload it shortly.
>
> Ftr cherry-picking the patch from 5.4 onto 5.2~bpo9+1 makes the two
> tests in question pass.
Good.
> The backport I just uploaded does not contain
> the cherry pick, however.
Did you also fix "#902578: dgit: missing seperator ..." in your
backport ? 5.2 has that bug.
Thanks,
Ian.
--
Ian JacksonThese opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
Bug#902559: some tests can fail if gnupg happens not to be installed
Hello, On Wed, Jun 27 2018, Ian Jackson wrote: > Here is a better patch. This has passed more tests. If all is well I > will upload it shortly. Ftr cherry-picking the patch from 5.4 onto 5.2~bpo9+1 makes the two tests in question pass. The backport I just uploaded does not contain the cherry pick, however. -- Sean Whitton signature.asc Description: PGP signature
Bug#902559: some tests can fail if gnupg happens not to be installed
Ian Jackson writes ("Re: Bug#902559: some tests can fail if gnupg happens not
to be installed"):
> Here is a better patch. This has passed more tests. If all is well I
> will upload it shortly.
>From 03d9c0e7c24a96cd792c051026afd46a7fd02bfc Mon Sep 17 00:00:00 2001
From: Ian Jackson
Date: Wed, 27 Jun 2018 21:41:38 +0100
Subject: [PATCH v2] 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
---
debian/changelog | 2 ++
tests/lib | 12
tests/setup/gdr-convert-gbp | 3 +++
tests/setup/gdr-convert-gbp-noarchive | 1 +
tests/tests/gdr-newupstream | 1 +
tests/tests/gdr-viagit| 1 +
6 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4d05abe3..e984276e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
dgit (5.4~) unstable; urgency=medium
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
--
2.11.0
--
Ian JacksonThese opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
Bug#902559: some tests can fail if gnupg happens not to be installed
Control: tags -1 + patch Here is a better patch. This has passed more tests. If all is well I will upload it shortly. Sean, you can probably get autopkgtest to run the new test suite against the old source code, if you want to test your backport. It may be easier to wait for 5.4 though. Ian.
Bug#902559: some tests can fail if gnupg happens not to be installed
Control: tags -1 - patch This patch does not work properly.
Bug#902559: some tests can fail if gnupg happens not to be installed
Control: retitle -1 some tests can fail if gnupg happens not to be installed
Control: tags -1 + patch
Sean, you might want to try this patch. I still intend to fix up the
commit message, run this through my usual pre-upload tests, etc. but
it should be in sid very soon.
Ian.
>From cb8e3355cf9816b86a16108fd22405624aa5a8f4 Mon Sep 17 00:00:00 2001
From: Ian Jackson
Date: Wed, 27 Jun 2018 21:41:38 +0100
Subject: [PATCH] test suite: gdr-viagit, gdr-newupstream: do not auto-import
t-setup-gnupg. This fixes them in chroots without gnupg.
---
debian/changelog | 2 ++
tests/lib | 12
tests/setup/gdr-convert-gbp | 1 +
tests/setup/gdr-convert-gbp-noarchive | 1 +
tests/tests/gdr-newupstream | 1 +
tests/tests/gdr-viagit| 1 +
6 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4d05abe3..79c398cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
dgit (5.4~) unstable; urgency=medium
Bugfixes:
+ * test suite: gdr-viagit, gdr-newupstream: do not auto-import
+t-setup-gnupg. This fixes them in chroots without gnupg.
* 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..7d123414 100755
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -1,5 +1,6 @@
#!/bin/bash
set -e
+autoimport=
. tests/lib
. $troot/lib-gdr
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
--
2.11.0
--
Ian JacksonThese opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
