From a5e3f949c24d8c757b2b944103c116db7d27da99 Mon Sep 17 00:00:00 2001 From: Chris Coutinho Date: Fri, 1 Aug 2025 12:08:27 +0200 Subject: [PATCH] Use unique calendar_test_client --- tests/integration/test_calendar_operations.py | 116 ++++++++++++------ 1 file changed, 77 insertions(+), 39 deletions(-) diff --git a/tests/integration/test_calendar_operations.py b/tests/integration/test_calendar_operations.py index 31ff512..efcebed 100644 --- a/tests/integration/test_calendar_operations.py +++ b/tests/integration/test_calendar_operations.py @@ -14,6 +14,16 @@ logger = logging.getLogger(__name__) pytestmark = pytest.mark.integration +@pytest.fixture +async def calendar_test_client(): + """Create a new, isolated NextcloudClient for calendar tests.""" + client = NextcloudClient.from_env() + try: + yield client + finally: + await client.close() + + @pytest.fixture def test_calendar_name(): """Unique calendar name for testing.""" @@ -21,14 +31,16 @@ def test_calendar_name(): @pytest.fixture -async def temporary_calendar(nc_client: NextcloudClient, test_calendar_name: str): +async def temporary_calendar( + calendar_test_client: NextcloudClient, test_calendar_name: str +): """Create a temporary calendar for testing and clean up afterward.""" calendar_name = test_calendar_name try: # Create a test calendar logger.info(f"Creating temporary calendar: {calendar_name}") - result = await nc_client.calendar.create_calendar( + result = await calendar_test_client.calendar.create_calendar( calendar_name=calendar_name, display_name=f"Test Calendar {calendar_name}", description="Temporary calendar for integration testing", @@ -49,14 +61,16 @@ async def temporary_calendar(nc_client: NextcloudClient, test_calendar_name: str # Cleanup: Delete the temporary calendar try: logger.info(f"Cleaning up temporary calendar: {calendar_name}") - await nc_client.calendar.delete_calendar(calendar_name) + await calendar_test_client.calendar.delete_calendar(calendar_name) logger.info(f"Successfully deleted temporary calendar: {calendar_name}") except Exception as e: logger.error(f"Error deleting temporary calendar {calendar_name}: {e}") @pytest.fixture -async def temporary_event(nc_client: NextcloudClient, temporary_calendar: str): +async def temporary_event( + calendar_test_client: NextcloudClient, temporary_calendar: str +): """Create a temporary event for testing and clean up afterward.""" event_uid = None calendar_name = temporary_calendar @@ -76,7 +90,9 @@ async def temporary_event(nc_client: NextcloudClient, temporary_calendar: str): try: logger.info(f"Creating temporary event in calendar: {calendar_name}") - result = await nc_client.calendar.create_event(calendar_name, event_data) + result = await calendar_test_client.calendar.create_event( + calendar_name, event_data + ) event_uid = result.get("uid") if not event_uid: @@ -90,7 +106,9 @@ async def temporary_event(nc_client: NextcloudClient, temporary_calendar: str): if event_uid: try: logger.info(f"Cleaning up temporary event: {event_uid}") - await nc_client.calendar.delete_event(calendar_name, event_uid) + await calendar_test_client.calendar.delete_event( + calendar_name, event_uid + ) logger.info(f"Successfully deleted temporary event: {event_uid}") except HTTPStatusError as e: if e.response.status_code != 404: @@ -101,9 +119,9 @@ async def temporary_event(nc_client: NextcloudClient, temporary_calendar: str): ) -async def test_list_calendars(nc_client: NextcloudClient): +async def test_list_calendars(calendar_test_client: NextcloudClient): """Test listing available calendars.""" - calendars = await nc_client.calendar.list_calendars() + calendars = await calendar_test_client.calendar.list_calendars() assert isinstance(calendars, list) @@ -125,7 +143,7 @@ async def test_list_calendars(nc_client: NextcloudClient): async def test_create_and_delete_event( - nc_client: NextcloudClient, temporary_calendar: str + calendar_test_client: NextcloudClient, temporary_calendar: str ): """Test creating and deleting a basic event.""" calendar_name = temporary_calendar @@ -144,7 +162,9 @@ async def test_create_and_delete_event( } try: - result = await nc_client.calendar.create_event(calendar_name, event_data) + result = await calendar_test_client.calendar.create_event( + calendar_name, event_data + ) assert "uid" in result assert result["status_code"] in [200, 201, 204] @@ -152,7 +172,7 @@ async def test_create_and_delete_event( logger.info(f"Created event with UID: {event_uid}") # Verify event was created by retrieving it - retrieved_event, etag = await nc_client.calendar.get_event( + retrieved_event, etag = await calendar_test_client.calendar.get_event( calendar_name, event_uid ) assert retrieved_event["uid"] == event_uid @@ -160,7 +180,9 @@ async def test_create_and_delete_event( assert retrieved_event["location"] == "Test Room" # Delete event - delete_result = await nc_client.calendar.delete_event(calendar_name, event_uid) + delete_result = await calendar_test_client.calendar.delete_event( + calendar_name, event_uid + ) assert delete_result["status_code"] in [200, 204, 404] logger.info(f"Successfully deleted event: {event_uid}") @@ -171,7 +193,7 @@ async def test_create_and_delete_event( async def test_create_all_day_event( - nc_client: NextcloudClient, temporary_calendar: str + calendar_test_client: NextcloudClient, temporary_calendar: str ): """Test creating an all-day event.""" calendar_name = temporary_calendar @@ -186,19 +208,21 @@ async def test_create_all_day_event( } try: - result = await nc_client.calendar.create_event(calendar_name, event_data) + result = await calendar_test_client.calendar.create_event( + calendar_name, event_data + ) event_uid = result["uid"] logger.info(f"Created all-day event with UID: {event_uid}") # Verify event - retrieved_event, _ = await nc_client.calendar.get_event( + retrieved_event, _ = await calendar_test_client.calendar.get_event( calendar_name, event_uid ) assert retrieved_event["title"] == "All Day Test Event" assert retrieved_event.get("all_day") is True # Cleanup - await nc_client.calendar.delete_event(calendar_name, event_uid) + await calendar_test_client.calendar.delete_event(calendar_name, event_uid) except Exception as e: logger.error(f"All-day event test failed: {e}") @@ -206,7 +230,7 @@ async def test_create_all_day_event( async def test_create_recurring_event( - nc_client: NextcloudClient, temporary_calendar: str + calendar_test_client: NextcloudClient, temporary_calendar: str ): """Test creating a recurring event.""" calendar_name = temporary_calendar @@ -223,26 +247,30 @@ async def test_create_recurring_event( } try: - result = await nc_client.calendar.create_event(calendar_name, event_data) + result = await calendar_test_client.calendar.create_event( + calendar_name, event_data + ) event_uid = result["uid"] logger.info(f"Created recurring event with UID: {event_uid}") # Verify event - retrieved_event, _ = await nc_client.calendar.get_event( + retrieved_event, _ = await calendar_test_client.calendar.get_event( calendar_name, event_uid ) assert retrieved_event["title"] == "Weekly Recurring Test" assert retrieved_event.get("recurring") is True # Cleanup - await nc_client.calendar.delete_event(calendar_name, event_uid) + await calendar_test_client.calendar.delete_event(calendar_name, event_uid) except Exception as e: logger.error(f"Recurring event test failed: {e}") raise -async def test_list_events_in_range(nc_client: NextcloudClient, temporary_event: dict): +async def test_list_events_in_range( + calendar_test_client: NextcloudClient, temporary_event: dict +): """Test listing events within a date range.""" calendar_name = temporary_event["calendar_name"] @@ -250,7 +278,7 @@ async def test_list_events_in_range(nc_client: NextcloudClient, temporary_event: start_datetime = datetime.now() end_datetime = datetime.now() + timedelta(days=7) - events = await nc_client.calendar.get_calendar_events( + events = await calendar_test_client.calendar.get_calendar_events( calendar_name=calendar_name, start_datetime=start_datetime, end_datetime=end_datetime, @@ -271,7 +299,9 @@ async def test_list_events_in_range(nc_client: NextcloudClient, temporary_event: assert "start_datetime" in event -async def test_update_event(nc_client: NextcloudClient, temporary_event: dict): +async def test_update_event( + calendar_test_client: NextcloudClient, temporary_event: dict +): """Test updating an existing event.""" calendar_name = temporary_event["calendar_name"] event_uid = temporary_event["uid"] @@ -285,13 +315,15 @@ async def test_update_event(nc_client: NextcloudClient, temporary_event: dict): } try: - result = await nc_client.calendar.update_event( + result = await calendar_test_client.calendar.update_event( calendar_name, event_uid, updated_data ) assert result["uid"] == event_uid # Verify updates - updated_event, _ = await nc_client.calendar.get_event(calendar_name, event_uid) + updated_event, _ = await calendar_test_client.calendar.get_event( + calendar_name, event_uid + ) assert updated_event["title"] == "Updated Test Event Title" assert updated_event["description"] == "Updated description for test event" assert updated_event["location"] == "Updated Location" @@ -305,7 +337,7 @@ async def test_update_event(nc_client: NextcloudClient, temporary_event: dict): async def test_create_event_with_attendees( - nc_client: NextcloudClient, temporary_calendar: str + calendar_test_client: NextcloudClient, temporary_calendar: str ): """Test creating an event with attendees.""" calendar_name = temporary_calendar @@ -323,12 +355,14 @@ async def test_create_event_with_attendees( } try: - result = await nc_client.calendar.create_event(calendar_name, event_data) + result = await calendar_test_client.calendar.create_event( + calendar_name, event_data + ) event_uid = result["uid"] logger.info(f"Created event with attendees, UID: {event_uid}") # Verify event - retrieved_event, _ = await nc_client.calendar.get_event( + retrieved_event, _ = await calendar_test_client.calendar.get_event( calendar_name, event_uid ) assert retrieved_event["title"] == "Meeting with Attendees" @@ -336,7 +370,7 @@ async def test_create_event_with_attendees( assert retrieved_event["status"] == "TENTATIVE" # Cleanup - await nc_client.calendar.delete_event(calendar_name, event_uid) + await calendar_test_client.calendar.delete_event(calendar_name, event_uid) except Exception as e: logger.error(f"Event with attendees test failed: {e}") @@ -344,33 +378,33 @@ async def test_create_event_with_attendees( async def test_get_nonexistent_event( - nc_client: NextcloudClient, temporary_calendar: str + calendar_test_client: NextcloudClient, temporary_calendar: str ): """Test retrieving a non-existent event.""" calendar_name = temporary_calendar fake_uid = f"nonexistent-{uuid.uuid4()}" with pytest.raises(HTTPStatusError) as exc_info: - await nc_client.calendar.get_event(calendar_name, fake_uid) + await calendar_test_client.calendar.get_event(calendar_name, fake_uid) assert exc_info.value.response.status_code == 404 logger.info(f"Correctly got 404 for nonexistent event: {fake_uid}") async def test_delete_nonexistent_event( - nc_client: NextcloudClient, temporary_calendar: str + calendar_test_client: NextcloudClient, temporary_calendar: str ): """Test deleting a non-existent event.""" calendar_name = temporary_calendar fake_uid = f"nonexistent-{uuid.uuid4()}" - result = await nc_client.calendar.delete_event(calendar_name, fake_uid) + result = await calendar_test_client.calendar.delete_event(calendar_name, fake_uid) assert result["status_code"] == 404 logger.info(f"Correctly got 404 for deleting nonexistent event: {fake_uid}") async def test_event_with_url_and_categories( - nc_client: NextcloudClient, temporary_calendar: str + calendar_test_client: NextcloudClient, temporary_calendar: str ): """Test creating an event with URL and multiple categories.""" calendar_name = temporary_calendar @@ -388,12 +422,14 @@ async def test_event_with_url_and_categories( } try: - result = await nc_client.calendar.create_event(calendar_name, event_data) + result = await calendar_test_client.calendar.create_event( + calendar_name, event_data + ) event_uid = result["uid"] logger.info(f"Created event with metadata, UID: {event_uid}") # Verify event - retrieved_event, _ = await nc_client.calendar.get_event( + retrieved_event, _ = await calendar_test_client.calendar.get_event( calendar_name, event_uid ) assert retrieved_event["title"] == "Event with URL and Categories" @@ -404,20 +440,22 @@ async def test_event_with_url_and_categories( assert retrieved_event.get("priority") == 2 # Cleanup - await nc_client.calendar.delete_event(calendar_name, event_uid) + await calendar_test_client.calendar.delete_event(calendar_name, event_uid) except Exception as e: logger.error(f"Event with metadata test failed: {e}") raise -async def test_calendar_operations_error_handling(nc_client: NextcloudClient): +async def test_calendar_operations_error_handling( + calendar_test_client: NextcloudClient, +): """Test error handling for calendar operations.""" # Test with non-existent calendar fake_calendar = f"nonexistent_calendar_{uuid.uuid4().hex}" with pytest.raises(HTTPStatusError): - await nc_client.calendar.get_calendar_events(fake_calendar) + await calendar_test_client.calendar.get_calendar_events(fake_calendar) logger.info("Error handling tests completed successfully")