From a937b82cd2dc578c978fd88ffc1f056f47672942 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 19 Apr 2022 11:01:05 +0200 Subject: [PATCH] test: Bump Cockpit test API to 267, use --track-naughties option run-tests recently got a new `--track-naughties` option [1] to explicitly enable updating known issues on GitHub. Enable it for CI runs, and leave it disabled for local runs and PackIt, as in these cases we don't want to try and talk to GitHub. [1] https://github.com/cockpit-project/cockpit/commit/7ef88e80ce613c --- Makefile | 4 ++-- test/run | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1f06bf8..43b78f5 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,7 @@ prepare-check: $(NODE_MODULES_TEST) $(VM_IMAGE) test/common # run the browser integration tests; skip check for SELinux denials # this will run all tests/check-* and format them as TAP check: prepare-check - TEST_AUDIT_NO_SELINUX=1 test/common/run-tests + TEST_AUDIT_NO_SELINUX=1 test/common/run-tests ${RUN_TESTS_OPTIONS} # checkout Cockpit's bots for standard test VM images and API to launch them # must be from main, as only that has current and existing images; but testvm.py API is stable @@ -177,7 +177,7 @@ bots: # when you start a new project, use the latest release, and update it from time to time test/common: flock Makefile sh -ec '\ - git fetch --depth=1 https://github.com/cockpit-project/cockpit.git 265; \ + git fetch --depth=1 https://github.com/cockpit-project/cockpit.git 267; \ git checkout --force FETCH_HEAD -- test/common; \ git reset test/common' diff --git a/test/run b/test/run index ed43e3a..b2cd769 100755 --- a/test/run +++ b/test/run @@ -5,4 +5,5 @@ set -eu # arguments but with an appropriate $TEST_OS, and optionally $TEST_SCENARIO [ -z "${TEST_SCENARIO:-}" ] || export TEST_BROWSER="$TEST_SCENARIO" +export RUN_TESTS_OPTIONS=--track-naughties make check