Skip to content

Commit 73acffe

Browse files
committed
add timeout
1 parent 0299439 commit 73acffe

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

chia/_tests/farmer_harvester/test_third_party_harvesters.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ async def test_harvester_receive_source_signing_data(
9292
UnresolvedPeerInfo(str(full_node_service_1.self_hostname), full_node_service_1._server.get_port())
9393
)
9494

95-
await wait_until_node_type_connected(farmer.server, NodeType.FULL_NODE)
96-
await wait_until_node_type_connected(farmer.server, NodeType.HARVESTER) # Should already be connected
97-
await wait_until_node_type_connected(full_node_1.server, NodeType.FULL_NODE)
95+
await time_out_assert(60, node_type_connected, True, farmer.server, NodeType.FULL_NODE)
96+
await time_out_assert(60, node_type_connected, True, farmer.server, NodeType.HARVESTER)
97+
await time_out_assert(60, node_type_connected, True, full_node_1.server, NodeType.FULL_NODE)
9898

9999
# Prepare test data
100100
blocks: list[FullBlock]
@@ -429,12 +429,11 @@ def log_has_new_text() -> bool:
429429
return False
430430

431431

432-
async def wait_until_node_type_connected(server: ChiaServer, node_type: NodeType) -> WSChiaConnection:
433-
while True:
434-
for peer in server.all_connections.values():
435-
if peer.connection_type == node_type.value:
436-
return peer
437-
await asyncio.sleep(1)
432+
def node_type_connected(server: ChiaServer, node_type: NodeType) -> bool:
433+
for peer in server.all_connections.values():
434+
if peer.connection_type == node_type.value:
435+
return True
436+
return False
438437

439438

440439
def decode_sp(

0 commit comments

Comments
 (0)