diff options
| -rwxr-xr-x | .travis/lint_06_script.sh | 3 | ||||
| -rwxr-xr-x | test/functional/test_runner.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis/lint_06_script.sh b/.travis/lint_06_script.sh index 6191d8257..701e6d800 100755 --- a/.travis/lint_06_script.sh +++ b/.travis/lint_06_script.sh @@ -19,6 +19,7 @@ test/lint/check-rpc-mappings.py . test/lint/lint-all.sh if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then + git log --merges --before="2 days ago" -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit while read -r LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys && - travis_wait 50 contrib/verify-commits/verify-commits.py; + travis_wait 50 contrib/verify-commits/verify-commits.py --clean-merge=2; fi diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index ad53788b0..5541b4469 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -366,7 +366,7 @@ def run_tests(*, test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage= tmpdir=tmpdir, test_list=test_list, flags=flags, - timeout_duration=20 * 60 if runs_ci else float('inf'), # in seconds + timeout_duration=40 * 60 if runs_ci else float('inf'), # in seconds ) start_time = time.time() test_results = [] |