Merge ~adrien/ubuntu/+source/gnutls28:autopkgtests-fixes-with-system-config into ubuntu/+source/gnutls28:ubuntu/devel

Proposed by Adrien Nader
Status: Needs review
Proposed branch: ~adrien/ubuntu/+source/gnutls28:autopkgtests-fixes-with-system-config
Merge into: ubuntu/+source/gnutls28:ubuntu/devel
Diff against target: 27 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/tests/run-upstream-testsuite (+1/-1)
Reviewer Review Type Date Requested Status
Simon Quigley (community) Approve
git-ubuntu import Pending
Review via email: mp+455781@code.launchpad.net

This proposal supersedes a proposal from 2023-11-16.

Description of the change

The gnutls testsuite is influenced by the configuration stored in /etc/gnutls/config. This means that the package build and tests succeeded until the most recent version of the package landed in -proposed because tests then started being run with the new package and the new configuration that it ships.

This merge request makes the testsuite pass by making it ignore the system-wide gnutls configuration. The dep8 tests don't set a dozen environment variables and therefore currently run in a different way than upstream's make check even though the scripts used are the same.

Long term, the dep8 tests should be changed to use the same environment as the upstream testsuite driver.

PPA at https://launchpad.net/~adrien-n/+archive/ubuntu/noble-gnutls-testsuite-config-fix

Ran autopkgtest using the PPA through the following: autopkgtest --no-built-binaries --apt-upgrade --setup-commands='apt install -y software-properties-common' --setup-commands='add-apt-repository ppa:adrien-n/noble-gnutls-testsuite-config-fix' .

To post a comment you must log in.
Revision history for this message
Simon Quigley (tsimonq2) wrote :

  , ,
 / \
((__-^^-,-^^-__))
 `-_---' `---_-'
  `--|o` 'o|--'
     \ ` /
      ): :(
      :o_o:
       "-"

review: Approve

Unmerged commits

8b1b258... by Adrien Nader

Ignore system-wide gnutls configuration when running the testsuite.

46d267f... by Adrien Nader

Forcefully disable TLS 1.0 and 1.1 through /etc/gnutls/config.

6ff85d1... by Jeremy BĂ­cha

3.8.1-4ubuntu2 (patches unapplied)

Imported using git-ubuntu import.

b9c4254... by Dan Bungert

changelog

009ded5... by Dan Bungert

fixes for autopkgtest i386

26b2f3d... by Steve Langasek

3.8.1-3ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 7b4ab77..808c2bd 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+gnutls28 (3.8.1-4ubuntu4) noble; urgency=medium
7+
8+ * Don't run the testsuite under the influence of a configuration file.
9+
10+ -- Adrien Nader <adrien.nader@canonical.com> Fri, 17 Nov 2023 11:08:39 +0100
11+
12 gnutls28 (3.8.1-4ubuntu3) noble; urgency=medium
13
14 * Forcefully disable TLS 1.0 and 1.1 through /etc/gnutls/config.
15diff --git a/debian/tests/run-upstream-testsuite b/debian/tests/run-upstream-testsuite
16index e061e36..bf88154 100755
17--- a/debian/tests/run-upstream-testsuite
18+++ b/debian/tests/run-upstream-testsuite
19@@ -51,7 +51,7 @@ for i in $(find ../../tests/ -type f -name '*.sh' | \
20 *)
21 d="";;
22 esac
23- if env srcdir=../../tests/$d sh $i ; then
24+ if env GNUTLS_SYSTEM_PRIORITY_FILE= srcdir=../../tests/$d sh $i ; then
25 echo SUCCESS [$count]$i
26 else
27 if [ $? = 77 ] ; then

Subscribers

People subscribed via source and target branches