From 63cd8bd055e56eba712a678465a46e86c4d5ae19 Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Tue, 26 Aug 2025 09:45:41 -0400 Subject: [PATCH] More cleanup for nox. Signed-off-by: Cliff Hill --- backend/tests/services/test_rooms.py | 28 +++++++++++++++++----------- backend/tests/services/test_users.py | 16 ++++++++++------ 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/backend/tests/services/test_rooms.py b/backend/tests/services/test_rooms.py index f9000177..bb260c32 100644 --- a/backend/tests/services/test_rooms.py +++ b/backend/tests/services/test_rooms.py @@ -34,7 +34,7 @@ async def test_get_rooms_success( mock_scalars_result = AsyncMock() mock_scalars_result.all = MagicMock(return_value=sample_rooms) mock_scalars = AsyncMock(return_value=mock_scalars_result) - async_session.scalars = mock_scalars + async_session.scalars = mock_scalars # type: ignore [method-assign] result: RoomList = await get_rooms(async_session) @@ -57,7 +57,7 @@ async def test_get_rooms_empty( mock_scalars_result = AsyncMock() mock_scalars_result.all = MagicMock(return_value=[]) mock_scalars = AsyncMock(return_value=mock_scalars_result) - async_session.scalars = mock_scalars + async_session.scalars = mock_scalars # type: ignore [method-assign] result: RoomList = await get_rooms(async_session) @@ -76,7 +76,9 @@ async def test_get_rooms_database_error( Verifies that get_rooms raises an exception on database failure. """ - async_session.scalars = AsyncMock(side_effect=SQLAlchemyError("Database error")) + async_session.scalars = AsyncMock( # type: ignore [method-assign] + side_effect=SQLAlchemyError("Database error") + ) with pytest.raises(SQLAlchemyError): await get_rooms(async_session) @@ -110,7 +112,7 @@ async def test_get_room_success( equipment="Projector", capacity=10, ) - async_session.scalar = AsyncMock(return_value=room) + async_session.scalar = AsyncMock(return_value=room) # type: ignore [method-assign] result: Room = await get_room(async_session, room_id) @@ -136,7 +138,7 @@ async def test_get_room_not_found( Verifies that get_room raises NoResultFound when the room is not found. """ - async_session.scalar = AsyncMock(return_value=None) + async_session.scalar = AsyncMock(return_value=None) # type: ignore [method-assign] with pytest.raises(NoResultFound): await get_room(async_session, room_id) @@ -156,7 +158,9 @@ async def test_get_room_database_error( Verifies that get_room raises an exception on database failure. """ room_id: int = 1 - async_session.scalar = AsyncMock(side_effect=SQLAlchemyError("Database error")) + async_session.scalar = AsyncMock( # type: ignore [method-assign] + side_effect=SQLAlchemyError("Database error") + ) with pytest.raises(SQLAlchemyError): await get_room(async_session, room_id) @@ -178,8 +182,8 @@ async def test_new_room_success( room = Room( id=1, name="Room A", location="Building 1", equipment="Projector", capacity=10 ) - async_session.add = MagicMock() - async_session.commit = AsyncMock() + async_session.add = MagicMock() # type: ignore [method-assign] + async_session.commit = AsyncMock() # type: ignore [method-assign] result: Room = await new_room(async_session, room) @@ -200,9 +204,11 @@ async def test_new_room_database_error( room = Room( id=1, name="Room A", location="Building 1", equipment="Projector", capacity=10 ) - async_session.add = MagicMock() - async_session.commit = AsyncMock(side_effect=SQLAlchemyError("Database error")) - async_session.rollback = AsyncMock() + async_session.add = MagicMock() # type: ignore [method-assign] + async_session.commit = AsyncMock( # type: ignore [method-assign] + side_effect=SQLAlchemyError("Database error") + ) + async_session.rollback = AsyncMock() # type: ignore [method-assign] with pytest.raises(SQLAlchemyError): await new_room(async_session, room) diff --git a/backend/tests/services/test_users.py b/backend/tests/services/test_users.py index ec9cd461..9058d8dc 100644 --- a/backend/tests/services/test_users.py +++ b/backend/tests/services/test_users.py @@ -28,7 +28,7 @@ async def test_get_users_success( mock_scalars_result = AsyncMock() mock_scalars_result.all = MagicMock(return_value=sample_users) mock_scalars = AsyncMock(return_value=mock_scalars_result) - async_session.scalars = mock_scalars + async_session.scalars = mock_scalars # type: ignore [method-assign] result: UserList = await get_users(async_session) @@ -51,7 +51,7 @@ async def test_get_users_empty( mock_scalars_result = AsyncMock() mock_scalars_result.all = MagicMock(return_value=[]) mock_scalars = AsyncMock(return_value=mock_scalars_result) - async_session.scalars = mock_scalars + async_session.scalars = mock_scalars # type: ignore [method-assign] result: UserList = await get_users(async_session) @@ -70,7 +70,9 @@ async def test_get_users_database_error( Verifies that get_users raises an exception and logs an error on database failure. """ - async_session.scalars = AsyncMock(side_effect=SQLAlchemyError("Database error")) + async_session.scalars = AsyncMock( # type: ignore [method-assign] + side_effect=SQLAlchemyError("Database error") + ) with pytest.raises(SQLAlchemyError): await get_users(async_session) @@ -95,7 +97,7 @@ async def test_get_user_success( Verifies that get_user returns the correct user and constructs the correct query. """ user = User(email=email, name=expected_name) - async_session.scalar = AsyncMock(return_value=user) + async_session.scalar = AsyncMock(return_value=user) # type: ignore [method-assign] result: User = await get_user(async_session, email) @@ -124,7 +126,7 @@ async def test_get_user_not_found( Verifies that get_user raises NoResultFound and logs an error when the user is not found. """ - async_session.scalar = AsyncMock(return_value=None) + async_session.scalar = AsyncMock(return_value=None) # type: ignore [method-assign] with pytest.raises(NoResultFound): await get_user(async_session, email) @@ -144,7 +146,9 @@ async def test_get_user_database_error( Verifies that get_user raises an exception and logs an error on database failure. """ email: str = "user1@example.com" - async_session.scalar = AsyncMock(side_effect=SQLAlchemyError("Database error")) + async_session.scalar = AsyncMock( # type: ignore [method-assign] + side_effect=SQLAlchemyError("Database error") + ) with pytest.raises(SQLAlchemyError): await get_user(async_session, email)