diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-11-09 15:46:59 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-11-09 15:47:04 +0100 |
| commit | 4fd37d0a104ff1b05a3c8e374af9b2c92a0078c2 (patch) | |
| tree | 3190e3de468adf9ac05dae5cb644a05123e45fe4 /ci | |
| parent | 05aeeee34f1552ea9be553a55f927110393927bf (diff) | |
| parent | fab900802d74799ac1004265951be1b66e70cf76 (diff) | |
Merge #20292: test: Fix intermittent feature_taproot issue
fab900802d74799ac1004265951be1b66e70cf76 ci: Bump timeout factor (MarcoFalke)
50eb0c2512842b96a0128a7d592a357665f6e006 Small improvements to the Taproot functional tests (Pieter Wuille)
fac865b72d5c0e01fce74b84ab21e5ebbf069327 test: Fix intermittent feature_taproot issue (MarcoFalke)
fa1dea19fc50db449386c9f969adc5ad327a0f0d test: Fix deser issue in create_block (MarcoFalke)
fa762a3fd43e49f8572be69e9129cd9170855f76 test: Remove unused unnamed parameter from block.serialize call (MarcoFalke)
Pull request description:
This fixes three bugs. Also, fix some unrelated code style issues.
Please refer to the commit messages for more information.
ACKs for top commit:
laanwj:
Code review ACK fab900802d74799ac1004265951be1b66e70cf76
Tree-SHA512: 4e22c240cf345710f3b21fc63243126b90014b3656d0865ff87156e958dd1442e6572c6c0a5701dbbe503eee931a0ceb66eeeb3553137f3d1f5afd27a9f9cada
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/test/00_setup_env.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/test/00_setup_env.sh b/ci/test/00_setup_env.sh index 702e881862..72e29141a6 100755 --- a/ci/test/00_setup_env.sh +++ b/ci/test/00_setup_env.sh @@ -38,7 +38,7 @@ export RUN_SECURITY_TESTS=${RUN_SECURITY_TESTS:-false} # By how much to scale the test_runner timeouts (option --timeout-factor). # This is needed because some ci machines have slow CPU or disk, so sanitizers # might be slow or a reindex might be waiting on disk IO. -export TEST_RUNNER_TIMEOUT_FACTOR=${TEST_RUNNER_TIMEOUT_FACTOR:-4} +export TEST_RUNNER_TIMEOUT_FACTOR=${TEST_RUNNER_TIMEOUT_FACTOR:-40} export TEST_RUNNER_ENV=${TEST_RUNNER_ENV:-} export RUN_FUZZ_TESTS=${RUN_FUZZ_TESTS:-false} export EXPECTED_TESTS_DURATION_IN_SECONDS=${EXPECTED_TESTS_DURATION_IN_SECONDS:-1000} |