Skip to content

Commit 2d23082

Browse files
committed
bump test timeouts so that functional tests run in valgrind
1 parent 6fef85b commit 2d23082

File tree

9 files changed

+22
-9
lines changed

9 files changed

+22
-9
lines changed

contrib/valgrind.supp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,16 @@
184184
...
185185
fun:_ZN5BCLog6Logger12StartLoggingEv
186186
}
187+
{
188+
Suppress BCLog::Logger::StartLogging() still reachable memory warning
189+
Memcheck:Leak
190+
match-leak-kinds: reachable
191+
fun:malloc
192+
...
193+
fun:_ZN5BCLog6Logger12StartLoggingEv
194+
}
195+
{
196+
Suppress rest_blockhash_by_height Conditional jump or move depends on uninitialised value(s)
197+
Memcheck:Cond
198+
fun:_ZL24rest_blockhash_by_heightP11HTTPRequestRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
199+
}

test/functional/feature_abortnode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def run_test(self):
4040

4141
# Check that node0 aborted
4242
self.log.info("Waiting for crash")
43-
wait_until(lambda: self.nodes[0].is_node_stopped(), timeout=60)
43+
wait_until(lambda: self.nodes[0].is_node_stopped(), timeout=200)
4444
self.log.info("Node crashed - now verifying restart fails")
4545
self.nodes[0].assert_start_raises_init_error()
4646

test/functional/feature_block.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@ def reconnect_p2p(self, timeout=60):
14011401
self.nodes[0].disconnect_p2ps()
14021402
self.bootstrap_p2p(timeout=timeout)
14031403

1404-
def send_blocks(self, blocks, success=True, reject_reason=None, force_send=False, reconnect=False, timeout=60):
1404+
def send_blocks(self, blocks, success=True, reject_reason=None, force_send=False, reconnect=False, timeout=960):
14051405
"""Sends blocks to test node. Syncs and verifies that tip has advanced to most recent block.
14061406
14071407
Call with success = False if the tip shouldn't advance to the most recent block."""

test/functional/feature_help.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def setup_network(self):
1717
# Don't start the node
1818

1919
def get_node_output(self, *, ret_code_expected):
20-
ret_code = self.nodes[0].process.wait(timeout=5)
20+
ret_code = self.nodes[0].process.wait(timeout=60)
2121
assert_equal(ret_code, ret_code_expected)
2222
self.nodes[0].stdout.seek(0)
2323
self.nodes[0].stderr.seek(0)

test/functional/mempool_reorg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def run_test(self):
7676
spend_101_id = self.nodes[0].sendrawtransaction(spend_101_raw)
7777
spend_102_1_id = self.nodes[0].sendrawtransaction(spend_102_1_raw)
7878

79-
self.sync_all()
79+
self.sync_all(timeout=360)
8080

8181
assert_equal(set(self.nodes[0].getrawmempool()), {spend_101_id, spend_102_1_id, timelock_tx_id})
8282

@@ -91,7 +91,7 @@ def run_test(self):
9191
for node in self.nodes:
9292
node.invalidateblock(new_blocks[0])
9393

94-
self.sync_all()
94+
self.sync_all(timeout=360)
9595

9696
# mempool should be empty.
9797
assert_equal(set(self.nodes[0].getrawmempool()), set())

test/functional/p2p_invalid_messages.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def run_test(self):
7878

7979
# Peer 1, despite serving up a bunch of nonsense, should still be connected.
8080
self.log.info("Waiting for node to drop junk messages.")
81-
node.p2p.sync_with_ping(timeout=320)
81+
node.p2p.sync_with_ping(timeout=400)
8282
assert node.p2p.is_connected
8383

8484
#

test/functional/rpc_setban.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def run_test(self):
2626
self.nodes[1].setban("127.0.0.1", "add")
2727

2828
# Node 0 should not be able to reconnect
29-
with self.nodes[1].assert_debug_log(expected_msgs=['dropped (banned)\n'], timeout=5):
29+
with self.nodes[1].assert_debug_log(expected_msgs=['dropped (banned)\n'], timeout=50):
3030
self.restart_node(1, [])
3131
self.nodes[0].addnode("127.0.0.1:" + str(p2p_port(1)), "onetry")
3232

test/functional/wallet_dump.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def run_test(self):
137137

138138
# encrypt wallet, restart, unlock and dump
139139
self.nodes[0].encryptwallet('test')
140-
self.nodes[0].walletpassphrase('test', 10)
140+
self.nodes[0].walletpassphrase('test', 100)
141141
# Should be a no-op:
142142
self.nodes[0].keypoolrefill()
143143
self.nodes[0].dumpwallet(wallet_enc_dump)

test/functional/wallet_groups.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def set_test_params(self):
1616
self.setup_clean_chain = True
1717
self.num_nodes = 3
1818
self.extra_args = [[], [], ['-avoidpartialspends']]
19-
self.rpc_timeout = 120
19+
self.rpc_timeout = 240
2020

2121
def skip_test_if_missing_module(self):
2222
self.skip_if_no_wallet()

0 commit comments

Comments
 (0)