From c662d23b9499cdd4ec9014f3c4d25d8cad19dbce Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 11 Sep 2025 10:45:03 +0100 Subject: [PATCH] tests: Add a way to skip the test involving mirroring screenshots Some build and CI systems operate fully offline in order to avoid dependencies on remote services. Skip this test if environment variable FLATPAK_BUILDER_TESTS_OFFLINE is set non-empty. Signed-off-by: Simon McVittie --- tests/test-builder.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/tests/test-builder.sh b/tests/test-builder.sh index 905601d1..489135f8 100755 --- a/tests/test-builder.sh +++ b/tests/test-builder.sh @@ -135,12 +135,16 @@ ${FLATPAK_BUILDER} $FL_GPGARGS --repo=$REPO --force-clean runtimedir \ echo "ok runtime build cleanup with build-args" -# test screenshot ref commit -${FLATPAK_BUILDER} --repo=$REPO/repo_sc --force-clean builddir_sc \ - --mirror-screenshots-url=https://example.org/media \ - org.flatpak_builder.gui.json >&2 -ostree --repo=$REPO/repo_sc refs|grep -Eq "^screenshots/$(flatpak --default-arch)$" -ostree checkout --repo=$REPO/repo_sc -U screenshots/$(flatpak --default-arch) outdir_sc -find outdir_sc -path "*/screenshots/image-1_orig.png" -type f | grep -q . - -echo "ok screenshot ref commit" +if [ -n "${FLATPAK_BUILDER_TESTS_OFFLINE-}" ]; then + echo "ok # SKIP - test requires Internet access" +else + # test screenshot ref commit + ${FLATPAK_BUILDER} --repo=$REPO/repo_sc --force-clean builddir_sc \ + --mirror-screenshots-url=https://example.org/media \ + org.flatpak_builder.gui.json >&2 + ostree --repo=$REPO/repo_sc refs|grep -Eq "^screenshots/$(flatpak --default-arch)$" + ostree checkout --repo=$REPO/repo_sc -U screenshots/$(flatpak --default-arch) outdir_sc + find outdir_sc -path "*/screenshots/image-1_orig.png" -type f | grep -q . + + echo "ok screenshot ref commit" +fi