diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-05-06 10:12:55 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-05-06 10:12:55 +0000 |
| commit | 5e06a65141f47b6a66eebda651391963fea610af (patch) | |
| tree | 714057ef1b69253b70bd1239cfd1a3ac486a8b1b /test/integration | |
| parent | 477f32c18bcde4150dbfafc3cb6335ce177fc498 (diff) | |
| parent | 7994d1b3bdaaef1351872f13054d1ed9d645f65a (diff) | |
Merge branch 'policy-as-of' into 'main'
test: Fix test-skipped regression in 3.0.1
See merge request apt-team/apt!476
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/framework | 4 | ||||
| -rwxr-xr-x | test/integration/test-releasefile-verification | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/test/integration/framework b/test/integration/framework index 3f0290569..37f09c678 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -591,6 +591,10 @@ EOF echo 'quiet::NoSolver3Explanation "true";' > rootdir/etc/apt/apt.conf.d/disable-solver3-context + + export APT_SEQUOIA_CRYPTO_POLICY="$PWD/sequoia.config" + touch "$APT_SEQUOIA_CRYPTO_POLICY" + # most tests just need one signed Release file, not both export APT_DONT_SIGN='Release.gpg' diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification index e15752482..dcc162a75 100755 --- a/test/integration/test-releasefile-verification +++ b/test/integration/test-releasefile-verification @@ -374,14 +374,13 @@ Signed-By: ${SEBASTIAN}" rootdir/var/lib/apt/lists/*Release " aptcache show apt installaptnew - if test -e "${METHODSDIR}/sqv"; then + if [ -z "$GPGV" ] && test -e "${METHODSDIR}/sqv"; then msgmsg 'Warm archive with ahead-policy-rejected subkey signing' 'Sebastian Subkey' - cat > sequoia.config << EOF + cat > test-sequoia.config << EOF [asymmetric_algorithms] rsa3072 = $(date +%Y-%m-%d --date="now + 6 months") EOF - APT_SEQUOIA_CRYPTO_POLICY=$PWD/sequoia.config updatewithwarnings "W: http://localhost:${APTHTTPPORT}/Release.gpg: Policy will reject signature within a year, see --audit for details" - exit + APT_SEQUOIA_CRYPTO_POLICY=$PWD/test-sequoia.config updatewithwarnings "W: http://localhost:${APTHTTPPORT}/.*Release.*: Policy will reject signature within a year, see --audit for details" fi msgmsg 'Warm archive with wrong exact subkey signing' 'Sebastian Subkey' |