From 9aca38b2793b7a53938ff62526ed8b874093636f Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 10 Sep 2019 14:52:46 +0930 Subject: [PATCH] pytest: increase non-developer timeout. We overrode this with travis, but it's not a travis issue. Signed-off-by: Rusty Russell --- tests/utils.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/utils.py b/tests/utils.py index 017b1d623..5c356b4cc 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -39,7 +39,14 @@ with open('config.vars') as configfile: DEVELOPER = os.getenv("DEVELOPER", config['DEVELOPER']) == "1" EXPERIMENTAL_FEATURES = os.getenv("EXPERIMENTAL_FEATURES", config['EXPERIMENTAL_FEATURES']) == "1" -TIMEOUT = int(os.getenv("TIMEOUT", "60")) + +# Gossip can be slow without DEVELOPER. +if DEVELOPER: + DEFAULT_TIMEOUT = 60 +else: + DEFAULT_TIMEOUT = 180 + +TIMEOUT = int(os.getenv("TIMEOUT", str(DEFAULT_TIMEOUT))) VALGRIND = os.getenv("VALGRIND", config['VALGRIND']) == "1" SLOW_MACHINE = os.getenv("SLOW_MACHINE", "0") == "1" COMPAT = os.getenv("COMPAT", config['COMPAT']) == "1"