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:
committed by
Rusty Russell
parent
49049deb82
commit
eae521b15d
1
.github/workflows/ci.yaml
vendored
1
.github/workflows/ci.yaml
vendored
@@ -17,6 +17,7 @@ env:
|
|||||||
SLOW_MACHINE: 1
|
SLOW_MACHINE: 1
|
||||||
CI_SERVER_URL: "http://35.239.136.52:3170"
|
CI_SERVER_URL: "http://35.239.136.52:3170"
|
||||||
PYTEST_OPTS_BASE: "-vvv --junit-xml=report.xml --timeout=1800 --durations=10"
|
PYTEST_OPTS_BASE: "-vvv --junit-xml=report.xml --timeout=1800 --durations=10"
|
||||||
|
TEST_LOG_IGNORE_ERRORS: "1"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
prebuild:
|
prebuild:
|
||||||
|
|||||||
1
.github/workflows/coverage-nightly.yaml
vendored
1
.github/workflows/coverage-nightly.yaml
vendored
@@ -91,6 +91,7 @@ jobs:
|
|||||||
PYTEST_PAR: ${{ matrix.pytest_par }}
|
PYTEST_PAR: ${{ matrix.pytest_par }}
|
||||||
SLOW_MACHINE: 1
|
SLOW_MACHINE: 1
|
||||||
TIMEOUT: 900
|
TIMEOUT: 900
|
||||||
|
TEST_LOG_IGNORE_ERRORS: "1"
|
||||||
run: |
|
run: |
|
||||||
mkdir -p "$CLN_COVERAGE_DIR"
|
mkdir -p "$CLN_COVERAGE_DIR"
|
||||||
uv run eatmydata pytest tests/ -n ${PYTEST_PAR} -vvv
|
uv run eatmydata pytest tests/ -n ${PYTEST_PAR} -vvv
|
||||||
|
|||||||
2
Makefile
2
Makefile
@@ -518,7 +518,7 @@ ifeq ($(PYTEST),)
|
|||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
# Explicitly hand VALGRIND so you can override on make cmd line.
|
# 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
|
endif
|
||||||
|
|
||||||
check-fuzz: $(ALL_FUZZ_TARGETS)
|
check-fuzz: $(ALL_FUZZ_TARGETS)
|
||||||
|
|||||||
@@ -12,12 +12,15 @@ tasks:
|
|||||||
dir: '.'
|
dir: '.'
|
||||||
deps:
|
deps:
|
||||||
- build
|
- build
|
||||||
|
env:
|
||||||
|
TEST_LOG_IGNORE_ERRORS: "1"
|
||||||
cmds:
|
cmds:
|
||||||
- uv run pytest --force-flaky -vvv -n {{ .PYTEST_PAR }} tests {{ .CLI_ARGS }}
|
- uv run pytest --force-flaky -vvv -n {{ .PYTEST_PAR }} tests {{ .CLI_ARGS }}
|
||||||
|
|
||||||
test-liquid:
|
test-liquid:
|
||||||
env:
|
env:
|
||||||
TEST_NETWORK: "liquid-regtest"
|
TEST_NETWORK: "liquid-regtest"
|
||||||
|
TEST_LOG_IGNORE_ERRORS: "1"
|
||||||
cmds:
|
cmds:
|
||||||
- sed -i 's/TEST_NETWORK=regtest/TEST_NETWORK=liquid-regtest/g' config.vars
|
- sed -i 's/TEST_NETWORK=regtest/TEST_NETWORK=liquid-regtest/g' config.vars
|
||||||
- uv run make cln-grpc/proto/node.proto
|
- uv run make cln-grpc/proto/node.proto
|
||||||
@@ -62,6 +65,8 @@ tasks:
|
|||||||
deps:
|
deps:
|
||||||
- in-docker-init
|
- in-docker-init
|
||||||
- in-docker-build-deps
|
- in-docker-build-deps
|
||||||
|
env:
|
||||||
|
TEST_LOG_IGNORE_ERRORS: "1"
|
||||||
cmds:
|
cmds:
|
||||||
# This way of copying allows us to copy the dirty tree, without
|
# This way of copying allows us to copy the dirty tree, without
|
||||||
# triggering any of the potentially configured hooks which might
|
# triggering any of the potentially configured hooks which might
|
||||||
|
|||||||
Reference in New Issue
Block a user