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.
This commit is contained in:
Christian Decker
2026-01-14 15:49:03 +01:00
committed by Rusty Russell
parent 49049deb82
commit eae521b15d
4 changed files with 8 additions and 1 deletions

View File

@@ -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:

View File

@@ -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

View File

@@ -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)

View File

@@ -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