Skip to content

Commit e48bb9f

Browse files
committed
fix timeout
1 parent 0299439 commit e48bb9f

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

chia/_tests/conftest.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,11 +1274,6 @@ async def farmer_harvester_2_simulators_zero_bits_plot_filter(
12741274
)
12751275

12761276
async with AsyncExitStack() as async_exit_stack:
1277-
bt = await create_block_tools_async(
1278-
zero_bit_plot_filter_consts,
1279-
keychain=get_temp_keyring,
1280-
)
1281-
12821277
config_overrides: dict[str, int] = {"full_node.max_sync_wait": 0}
12831278

12841279
bts = [
@@ -1309,10 +1304,10 @@ async def farmer_harvester_2_simulators_zero_bits_plot_filter(
13091304
]
13101305

13111306
[harvester_service], farmer_service, _ = await async_exit_stack.enter_async_context(
1312-
setup_farmer_solver_multi_harvester(bt, 1, tmp_path, bt.constants, start_services=True)
1307+
setup_farmer_solver_multi_harvester(bts[0], 1, tmp_path, bts[0].constants, start_services=True)
13131308
)
13141309

1315-
yield farmer_service, harvester_service, simulators[0], simulators[1], bt
1310+
yield farmer_service, harvester_service, simulators[0], simulators[1], bts[0]
13161311

13171312

13181313
@pytest.fixture(name="recording_web_server")

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)