From 12a3dfe6b86ca01ac2d643086b8f30e5b9189290 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Wed, 1 Jan 2025 22:20:25 +0100
Subject: test: Check "${METHODSDIR}/sqv" not "/usr/bin/sqv"

This is the correct check to find out whether we have built
with sqv support.
---
 .gitlab-ci.yml                                    | 4 +++-
 test/integration/test-apt-update-nofallback       | 4 ++--
 test/integration/test-apt-update-repeated-ims-hit | 2 +-
 test/integration/test-apt-update-rollback         | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3bf32b283..0147b37db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@ variables:
   CCACHE_BASEDIR: $CI_PROJECT_DIR
   APT_CMAKE_BUILD_OPTIONS: ''
   DEB_BUILD_PROFILES: ''
+  BUILD_PRE: ':'
 cache:
   paths:
     - .ccache
@@ -17,6 +18,7 @@ before_script:
     - chmod -R o+rwX $PWD
     - ./prepare-release travis-ci
     - sudo -u travis mkdir -p build .ccache
+    - $BUILD_PRE
     - sudo -u travis env -C build cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ${APT_CMAKE_BUILD_OPTIONS} -G Ninja ..
     - sudo -u travis --preserve-env=CCACHE_DIR,CCACHE_BASEDIR ninja -C build
 
@@ -34,8 +36,8 @@ test solver3 and gpgv:
   variables:
     APT_CMAKE_BUILD_OPTIONS: '-DWITH_DOC=OFF -DUSE_NLS=OFF'
     DEB_BUILD_PROFILES: 'nodoc'
+    BUILD_PRE: 'rm /usr/bin/sqv'
   script:
-    - rm -f /usr/bin/sqv
     - CTEST_OUTPUT_ON_FAILURE=1 ninja -C build test
     - unbuffer ./test/integration/run-tests -q -j 4 --solver 3.0 --skip solver3.broken
 
diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index c9ee75756..95e445139 100755
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -198,7 +198,7 @@ test_inrelease_to_invalid_inrelease()
     sed -i 's/^Codename:.*/Codename: evil!/' "$APTARCHIVE/dists/unstable/InRelease"
     inject_evil_package
 
-    if test -e /usr/bin/sqv; then
+    if test -e "${METHODSDIR}/sqv"; then
         # FIXME: Do not assert sqv output
         testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable InRelease: Sub-process /usr/bin/sqv returned an error code (1), error message is: Verifying signature:            Message has been manipulated
 W: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease  Sub-process /usr/bin/sqv returned an error code (1), error message is: Verifying signature:            Message has been manipulated
@@ -225,7 +225,7 @@ test_release_gpg_to_invalid_release_release_gpg()
     # now subvert Release do no longer verify
     echo "Some evil data" >> "$APTARCHIVE/dists/unstable/Release"
     inject_evil_package
-    if test -e /usr/bin/sqv; then
+    if test -e "${METHODSDIR}/sqv"; then
         # FIXME: Do not assert sqv output
         testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable Release: Sub-process /usr/bin/sqv returned an error code (1), error message is: Verifying signature:            Message has been manipulated
 W: Failed to fetch file:${APTARCHIVE}/dists/unstable/Release.gpg  Sub-process /usr/bin/sqv returned an error code (1), error message is: Verifying signature:            Message has been manipulated
diff --git a/test/integration/test-apt-update-repeated-ims-hit b/test/integration/test-apt-update-repeated-ims-hit
index 43871a31f..57526c41b 100755
--- a/test/integration/test-apt-update-repeated-ims-hit
+++ b/test/integration/test-apt-update-repeated-ims-hit
@@ -40,7 +40,7 @@ rm -f rootdir/etc/apt/trusted.gpg.d/*
 sed -i -e 's#^deb #deb [trusted=yes] #' rootdir/etc/apt/sources.list.d/*
 
 APTARCHIVE="$(readlink -f ./aptarchive)"
-if test -e /usr/bin/sqv; then
+if test -e "${METHODSDIR}/sqv"; then
 GPGERROR="W: GPG error: file:$APTARCHIVE  Release: The signatures couldn't be verified because no keyring is specified"
 else
 GPGERROR="W: GPG error: file:$APTARCHIVE  Release: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 5A90D141DBAC8DAE"
diff --git a/test/integration/test-apt-update-rollback b/test/integration/test-apt-update-rollback
index 68505f6ba..7a8f57abb 100755
--- a/test/integration/test-apt-update-rollback
+++ b/test/integration/test-apt-update-rollback
@@ -156,7 +156,7 @@ test_inrelease_to_unauth_inrelease() {
 
     signreleasefiles 'Marvin Paranoid'
 
-    if test -e /usr/bin/sqv; then
+    if test -e "${METHODSDIR}/sqv"; then
         # FIXME: Do not assert sqv output
         testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable InRelease: Sub-process /usr/bin/sqv returned an error code (1), error message is: Missing key DE66AECA9151AFA1877EC31DE8525D47528144E2, which is needed to verify signature.
 W: Failed to fetch file:$APTARCHIVE/dists/unstable/InRelease  Sub-process /usr/bin/sqv returned an error code (1), error message is: Missing key DE66AECA9151AFA1877EC31DE8525D47528144E2, which is needed to verify signature.
-- 
cgit v1.2.3-70-g09d2