diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-12-21 01:03:22 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-12-21 01:03:28 +0100 |
| commit | 45fe39022a65b615fcb6baa1933ed52f5d0caa58 (patch) | |
| tree | 9ff2811dc2f6bdda62179cb4fb5ae7a30d010b70 | |
| parent | 86e0a33f5c382513d5179e3fdf158baf952d7e2f (diff) | |
| parent | fa05d52af475dc4109c09b70b17b22f5ffc6e6e6 (diff) | |
| download | bitcoin-45fe39022a65b615fcb6baa1933ed52f5d0caa58.tar.xz | |
Merge #15005: test: Bump timeout to run tests in travis thread sanitizer
fa05d52af4 test: Bump timeout to run tests in travis thread sanitizer (MarcoFalke)
Pull request description:
No need to exclude tests because their timeout was set too strict
Tree-SHA512: ea7032e674a66456bab40122adf4beebd703fd626a7567ca76d2a4e78041af115564d863dc7f742d39bd4adb249c29751439a1238d5e5c34e474c7221d4fd6e1
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | test/functional/feature_block.py | 6 | ||||
| -rwxr-xr-x | test/functional/p2p_invalid_messages.py | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index a7c6e03f2d..7abc6e8ffd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,6 @@ jobs: DOCKER_NAME_TAG=ubuntu:16.04 PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libssl-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev" NO_DEPENDS=1 - FUNCTIONAL_TESTS_CONFIG="--exclude feature_block.py,p2p_invalid_messages.py" GOAL="install" BITCOIN_CONFIG="--enable-zmq --disable-wallet --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=thread --disable-hardening --disable-asm CC=clang CXX=clang++" # x86_64 Linux (no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer) diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py index e50f67a345..b741339351 100755 --- a/test/functional/feature_block.py +++ b/test/functional/feature_block.py @@ -1181,7 +1181,7 @@ class FullBlockTest(BitcoinTestFramework): self.save_spendable_output() spend = self.get_spendable_output() - self.sync_blocks(blocks, True, timeout=180) + self.sync_blocks(blocks, True, timeout=480) chain1_tip = i # now create alt chain of same length @@ -1193,14 +1193,14 @@ class FullBlockTest(BitcoinTestFramework): # extend alt chain to trigger re-org block = self.next_block("alt" + str(chain1_tip + 1)) - self.sync_blocks([block], True, timeout=180) + self.sync_blocks([block], True, timeout=480) # ... and re-org back to the first chain self.move_tip(chain1_tip) block = self.next_block(chain1_tip + 1) self.sync_blocks([block], False, force_send=True) block = self.next_block(chain1_tip + 2) - self.sync_blocks([block], True, timeout=180) + self.sync_blocks([block], True, timeout=480) # Helper methods ################ diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py index 65997a5f9d..dbc5c5fff6 100755 --- a/test/functional/p2p_invalid_messages.py +++ b/test/functional/p2p_invalid_messages.py @@ -86,7 +86,7 @@ class InvalidMessagesTest(BitcoinTestFramework): # Peer 1, despite serving up a bunch of nonsense, should still be connected. self.log.info("Waiting for node to drop junk messages.") - node.p2p.sync_with_ping(timeout=30) + node.p2p.sync_with_ping(timeout=120) assert node.p2p.is_connected # |