Skip to content

Commit 94d1aab

Browse files
authored
tests: better resilience for concurrent node starts (#3011)
1 parent 228b974 commit 94d1aab

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

test/functional/test_framework/test_node.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def __init__(
7979
extra_args=None,
8080
use_cli=False,
8181
start_perf=False,
82-
use_valgrind=False
82+
use_valgrind=False,
8383
):
8484
"""
8585
Kwargs:
@@ -389,7 +389,7 @@ def start(self, extra_args=None, *, cwd=None, stdout=None, stderr=None, **kwargs
389389
stdout=stdout,
390390
stderr=stderr,
391391
cwd=cwd,
392-
**kwargs
392+
**kwargs,
393393
)
394394

395395
self.running = True
@@ -444,7 +444,12 @@ def wait_for_rpc_connection(self):
444444
self.w3 = Web3(Web3.HTTPProvider(evm_rpc.url))
445445
return
446446
except IOError as e:
447-
if e.errno != errno.ECONNREFUSED: # Port not yet open?
447+
if e.errno not in [
448+
None,
449+
0,
450+
errno.ECONNREFUSED,
451+
errno.ECONNRESET,
452+
]: # Port not yet open?
448453
raise # unknown IO error
449454
except JSONRPCException as e: # Initialization phase
450455
# -28 RPC in warmup
@@ -653,7 +658,7 @@ def assert_start_raises_init_error(
653658
expected_msg=None,
654659
match=ErrorMatch.FULL_TEXT,
655660
*args,
656-
**kwargs
661+
**kwargs,
657662
):
658663
"""Attempt to start the node and expect it to raise an error.
659664

0 commit comments

Comments
 (0)