sync update from LAN repo (source dhk-1 @ c21a2a4a)
This commit is contained in:
1 parent
264e2200d6
commit
a1fa13a238
122 files changed
+8881
-623
No files matched your search
@@ -69,6 +69,7 @@ async def _admit(repo: RoundtableRoomRepository, draft_id: str, user_id: str, **
|
||||
room_session_id=kwargs.get("room_session_id"),
|
||||
enabled=kwargs.get("enabled", True),
|
||||
max_rooms=kwargs.get("max_rooms", 3),
|
||||
lease_seconds=kwargs.get("lease_seconds", 5 * 60),
|
||||
extra_keys=kwargs.get("extra_keys"),
|
||||
)
|
||||
|
||||
@@ -257,6 +258,44 @@ async def test_delayed_heartbeat_cannot_resurrect_a_released_room(rooms) -> None
|
||||
assert next_room["ok"] is True
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_foreground_lease_defaults_to_five_minutes_and_honors_override(rooms) -> None:
|
||||
repo, factory = rooms
|
||||
before = datetime.now(UTC)
|
||||
admitted = await _admit(
|
||||
repo,
|
||||
"draft-lease",
|
||||
"user-a",
|
||||
room_session_id="lease-session",
|
||||
)
|
||||
assert admitted["ok"] is True
|
||||
key = compute_room_session_key("lease-session")
|
||||
assert key is not None
|
||||
async with factory() as session:
|
||||
row = await session.get(RoundtableRoomLeaseRow, key)
|
||||
assert row is not None and row.lease_until is not None
|
||||
until = row.lease_until if row.lease_until.tzinfo else row.lease_until.replace(tzinfo=UTC)
|
||||
remaining = until - before
|
||||
assert timedelta(minutes=4, seconds=50) <= remaining <= timedelta(minutes=5, seconds=5)
|
||||
|
||||
renewed = await repo.renew(
|
||||
draft_id="draft-lease",
|
||||
user_id="user-a",
|
||||
task_id=None,
|
||||
room_session_id="lease-session",
|
||||
enabled=True,
|
||||
max_rooms=3,
|
||||
lease_seconds=120,
|
||||
)
|
||||
assert renewed["ok"] is True
|
||||
async with factory() as session:
|
||||
row = await session.get(RoundtableRoomLeaseRow, key)
|
||||
assert row is not None and row.lease_until is not None
|
||||
until = row.lease_until if row.lease_until.tzinfo else row.lease_until.replace(tzinfo=UTC)
|
||||
renewed_for = until - datetime.now(UTC)
|
||||
assert timedelta(seconds=90) <= renewed_for <= timedelta(seconds=125)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_stale_run_for_leased_draft_does_not_consume_a_second_room(rooms) -> None:
|
||||
"""Run-manager fallback must not double-count the authoritative lease."""
|
||||
@@ -744,6 +783,7 @@ async def test_admin_can_change_roundtable_room_limit_without_restart(
|
||||
assert ss.get_roundtable_room_limit_settings().enabled is True
|
||||
assert ss.get_roundtable_room_limit_settings().max_rooms == 3
|
||||
assert ss.get_roundtable_room_limit_settings().max_hold_minutes == 30
|
||||
assert ss.get_roundtable_room_limit_settings().lease_minutes == 5
|
||||
assert ss.get_roundtable_room_limit_settings().max_cycles == 8
|
||||
assert ss.get_roundtable_room_limit_settings().write_file_compatibility_enabled is False
|
||||
|
||||
@@ -752,6 +792,7 @@ async def test_admin_can_change_roundtable_room_limit_without_restart(
|
||||
enabled=False,
|
||||
max_rooms=5,
|
||||
max_hold_minutes=45,
|
||||
lease_minutes=8,
|
||||
max_cycles=12,
|
||||
),
|
||||
SimpleNamespace(),
|
||||
@@ -759,9 +800,11 @@ async def test_admin_can_change_roundtable_room_limit_without_restart(
|
||||
assert saved.enabled is False
|
||||
assert saved.max_rooms == 5
|
||||
assert saved.max_hold_minutes == 45
|
||||
assert saved.lease_minutes == 8
|
||||
assert saved.max_cycles == 12
|
||||
assert ss.load_system_settings().roundtable_room_limit.max_rooms == 5
|
||||
assert ss.load_system_settings().roundtable_room_limit.max_hold_minutes == 45
|
||||
assert ss.load_system_settings().roundtable_room_limit.lease_minutes == 8
|
||||
assert ss.load_system_settings().roundtable_room_limit.max_cycles == 12
|
||||
assert saved.write_file_compatibility_enabled is False
|
||||
|
||||
|
||||
Reference in new issue
Block a user