make: Remove hardcoded timeout to pytest
This should really be set by the environment by creating either a pytest.ini or setting PYTEST_OPTS envvar.
This commit is contained in:
parent
1ea0dd6af2
commit
8c94d1a358
3
Makefile
3
Makefile
|
@ -76,9 +76,8 @@ ifeq ($(COMPAT),1)
|
|||
COMPAT_CFLAGS=-DCOMPAT_V052=1 -DCOMPAT_V060=1 -DCOMPAT_V061=1 -DCOMPAT_V062=1 -DCOMPAT_V070=1 -DCOMPAT_V072=1 -DCOMPAT_V073=1 -DCOMPAT_V080=1 -DCOMPAT_V081=1 -DCOMPAT_V082=1 -DCOMPAT_V090=1
|
||||
endif
|
||||
|
||||
# Timeout shortly before the 600 second travis silence timeout
|
||||
# (method=thread to support xdist)
|
||||
PYTEST_OPTS := -v --timeout=550 --timeout_method=thread -p no:logging $(PYTEST_OPTS)
|
||||
PYTEST_OPTS := -v -p no:logging $(PYTEST_OPTS)
|
||||
PYTHONPATH=$(shell pwd)/contrib/pyln-client:$(shell pwd)/contrib/pyln-testing:$(shell pwd)/contrib/pyln-proto/
|
||||
|
||||
# This is where we add new features as bitcoin adds them.
|
||||
|
|
Loading…
Reference in New Issue