Skip to content

Commit 53f4743

Browse files
committed
Merge bitcoin/bitcoin#35080: test: Add missing self.options.timeout_factor scale in tool_bitcoin_chainstate.py
fa02eb8 test: Add missing self.options.timeout_factor scale in tool_bitcoin_chainstate.py (MarcoFalke) Pull request description: Without the factor, the test may fail when run cross-arch, possibly with sanitizers. E.g. in qemu-aarch64 in docker in a x86-VM. ACKs for top commit: fanquake: ACK fa02eb8 Tree-SHA512: 7dbf492de7478bcc95a62576499947fa83031c43496700657014aa9b29f6665c2a226b71287b71b8cd7a5240036c00f069f12ab231539e3387fe86ca298d6933
2 parents edcf84c + fa02eb8 commit 53f4743

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

test/functional/tool_bitcoin_chainstate.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ def generate_snapshot_chain(self):
5151
assert_equal(n0.getbestblockhash(), SNAPSHOT_BASE_BLOCK_HASH)
5252
return n0.dumptxoutset('utxos.dat', "latest")
5353

54-
def add_block(self, datadir, input, expected_stderr=None, expected_stdout=None):
54+
def add_block(self, datadir, input, *, expected_stderr=None, expected_stdout=None):
5555
proc = subprocess.Popen(
5656
self.get_binaries().chainstate_argv() + ["-regtest", datadir],
5757
stdin=subprocess.PIPE,
5858
stdout=subprocess.PIPE,
5959
stderr=subprocess.PIPE,
60-
text=True
60+
text=True,
6161
)
62-
stdout, stderr = proc.communicate(input=input + "\n", timeout=5)
62+
stdout, stderr = proc.communicate(input=input + "\n", timeout=5 * self.options.timeout_factor)
6363
self.log.debug("STDOUT: {0}".format(stdout.strip("\n")))
6464
self.log.info("STDERR: {0}".format(stderr.strip("\n")))
6565

0 commit comments

Comments
 (0)