From eae521b15d408af296fab404d50fa7cb74d83889 Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Wed, 14 Jan 2026 15:49:03 +0100 Subject: [PATCH] chore: Ensure the logging library does not get upset when output capture is disabled. Changelog-Fixed: Testing infrastructure no longer fails when logging output capture is disabled. --- .github/workflows/ci.yaml | 1 + .github/workflows/coverage-nightly.yaml | 1 + Makefile | 2 +- Taskfile.yml | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f0b531c8e..28557a955 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,6 +17,7 @@ env: SLOW_MACHINE: 1 CI_SERVER_URL: "http://35.239.136.52:3170" PYTEST_OPTS_BASE: "-vvv --junit-xml=report.xml --timeout=1800 --durations=10" + TEST_LOG_IGNORE_ERRORS: "1" jobs: prebuild: diff --git a/.github/workflows/coverage-nightly.yaml b/.github/workflows/coverage-nightly.yaml index dfa896867..cbf04b2f4 100644 --- a/.github/workflows/coverage-nightly.yaml +++ b/.github/workflows/coverage-nightly.yaml @@ -91,6 +91,7 @@ jobs: PYTEST_PAR: ${{ matrix.pytest_par }} SLOW_MACHINE: 1 TIMEOUT: 900 + TEST_LOG_IGNORE_ERRORS: "1" run: | mkdir -p "$CLN_COVERAGE_DIR" uv run eatmydata pytest tests/ -n ${PYTEST_PAR} -vvv diff --git a/Makefile b/Makefile index 6576f6939..5b5f33b74 100644 --- a/Makefile +++ b/Makefile @@ -518,7 +518,7 @@ ifeq ($(PYTEST),) exit 1 else # Explicitly hand VALGRIND so you can override on make cmd line. - PYTHONPATH=$(MY_CHECK_PYTHONPATH) TEST_DEBUG=1 VALGRIND=$(VALGRIND) uv run $(PYTEST) $(PYTEST_TESTS) $(PYTEST_OPTS) + PYTHONPATH=$(MY_CHECK_PYTHONPATH) TEST_DEBUG=1 TEST_LOG_IGNORE_ERRORS=1 VALGRIND=$(VALGRIND) uv run $(PYTEST) $(PYTEST_TESTS) $(PYTEST_OPTS) endif check-fuzz: $(ALL_FUZZ_TARGETS) diff --git a/Taskfile.yml b/Taskfile.yml index 0daf83fb6..4c0c8fb7f 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -12,12 +12,15 @@ tasks: dir: '.' deps: - build + env: + TEST_LOG_IGNORE_ERRORS: "1" cmds: - uv run pytest --force-flaky -vvv -n {{ .PYTEST_PAR }} tests {{ .CLI_ARGS }} test-liquid: env: TEST_NETWORK: "liquid-regtest" + TEST_LOG_IGNORE_ERRORS: "1" cmds: - sed -i 's/TEST_NETWORK=regtest/TEST_NETWORK=liquid-regtest/g' config.vars - uv run make cln-grpc/proto/node.proto @@ -62,6 +65,8 @@ tasks: deps: - in-docker-init - in-docker-build-deps + env: + TEST_LOG_IGNORE_ERRORS: "1" cmds: # This way of copying allows us to copy the dirty tree, without # triggering any of the potentially configured hooks which might