From 8c94d1a35807f5868ab23480facd5aedf9046ea7 Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Tue, 19 Jan 2021 21:06:25 +0100 Subject: [PATCH] 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. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1d843c029..b2d635627 100644 --- a/Makefile +++ b/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.