From c1e3a6aeaab6cc86375193c154c952565ca6bee9 Mon Sep 17 00:00:00 2001 From: Chris Coutinho Date: Fri, 6 Jun 2025 19:11:31 +0200 Subject: [PATCH] chore: ruff format --- tests/integration/test_attachments.py | 42 ++++++++++---------- tests/integration/test_embedded_images.py | 18 ++++----- tests/integration/test_webdav_cleanup.py | 48 +++++++++++------------ 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/tests/integration/test_attachments.py b/tests/integration/test_attachments.py index bf3570d..870a23f 100644 --- a/tests/integration/test_attachments.py +++ b/tests/integration/test_attachments.py @@ -173,13 +173,13 @@ async def test_attachments_cleanup_on_note_delete( logger.error( f"Attachment directory still exists! PROPFIND returned {status}" ) - assert ( - False - ), f"Expected attachment directory to be gone, but PROPFIND returned {status}!" + assert False, ( + f"Expected attachment directory to be gone, but PROPFIND returned {status}!" + ) except HTTPStatusError as e: - assert ( - e.response.status_code == 404 - ), f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + assert e.response.status_code == 404, ( + f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + ) logger.info( "Verified attachment directory does not exist via PROPFIND (404 received)" ) @@ -283,13 +283,13 @@ async def test_attachments_category_change_handling(nc_client: NextcloudClient): logger.error( f"Old attachment directory still exists! PROPFIND returned {status}" ) - assert ( - False - ), f"Expected old directory to be gone, but PROPFIND returned {status} - directory still exists!" + assert False, ( + f"Expected old directory to be gone, but PROPFIND returned {status} - directory still exists!" + ) except HTTPStatusError as e: - assert ( - e.response.status_code == 404 - ), f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + assert e.response.status_code == 404, ( + f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + ) logger.info( "Verified old attachment directory does not exist via PROPFIND (404 received)" ) @@ -315,9 +315,9 @@ async def test_attachments_category_change_handling(nc_client: NextcloudClient): logger.error( f"New attachment directory not found! PROPFIND failed with {e.response.status_code}" ) - assert ( - False - ), f"Expected new attachment directory to exist, but PROPFIND failed with {e.response.status_code}" + assert False, ( + f"Expected new attachment directory to exist, but PROPFIND failed with {e.response.status_code}" + ) finally: # 6. Cleanup: Delete the note (client should use the *final* category for cleanup path) @@ -368,9 +368,9 @@ async def test_attachments_category_change_handling(nc_client: NextcloudClient): ]: # Successful PROPFIND means directory exists assert False, "New category attachment directory still exists!" except HTTPStatusError as e: - assert ( - e.response.status_code == 404 - ), f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + assert e.response.status_code == 404, ( + f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + ) logger.info( "Verified new category attachment directory is gone via PROPFIND" ) @@ -389,9 +389,9 @@ async def test_attachments_category_change_handling(nc_client: NextcloudClient): ]: # Successful PROPFIND means directory exists assert False, "Old category attachment directory still exists!" except HTTPStatusError as e: - assert ( - e.response.status_code == 404 - ), f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + assert e.response.status_code == 404, ( + f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + ) logger.info( "Verified old category attachment directory is gone via PROPFIND" ) diff --git a/tests/integration/test_embedded_images.py b/tests/integration/test_embedded_images.py index ad56342..fc90f38 100644 --- a/tests/integration/test_embedded_images.py +++ b/tests/integration/test_embedded_images.py @@ -99,9 +99,9 @@ async def test_note_with_embedded_image( logger.error( f"Attachment directory not found! PROPFIND failed with {e.response.status_code}" ) - assert ( - False - ), f"Expected attachment directory to exist, but PROPFIND failed with {e.response.status_code}" + assert False, ( + f"Expected attachment directory to exist, but PROPFIND failed with {e.response.status_code}" + ) # 2. Update the note content to include the embedded image references updated_content = f"""{note_data["content"]} @@ -171,13 +171,13 @@ async def test_note_with_embedded_image( logger.error( f"Attachment directory still exists! PROPFIND returned {status}" ) - assert ( - False - ), f"Expected attachment directory to be gone, but PROPFIND returned {status}!" + assert False, ( + f"Expected attachment directory to be gone, but PROPFIND returned {status}!" + ) except HTTPStatusError as e: - assert ( - e.response.status_code == 404 - ), f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + assert e.response.status_code == 404, ( + f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + ) logger.info( "Verified attachment directory does not exist via PROPFIND (404 received)" ) diff --git a/tests/integration/test_webdav_cleanup.py b/tests/integration/test_webdav_cleanup.py index 4f90e54..be6c2f0 100644 --- a/tests/integration/test_webdav_cleanup.py +++ b/tests/integration/test_webdav_cleanup.py @@ -108,17 +108,17 @@ async def test_category_change_cleans_up_old_attachments_directory( logger.error( "ISSUE DETECTED: Was able to retrieve attachment from old category path!" ) - assert ( - False - ), "Old category attachment directory still exists and accessible!" + assert False, ( + "Old category attachment directory still exists and accessible!" + ) except HTTPStatusError as e: # This is the expected outcome - old directory should be gone logger.info( f"Correctly got error accessing old category path: {e.response.status_code}" ) - assert ( - e.response.status_code == 404 - ), f"Expected 404, got {e.response.status_code}" + assert e.response.status_code == 404, ( + f"Expected 404, got {e.response.status_code}" + ) logger.info( "Verified old category attachment directory is not accessible (good!)" ) @@ -144,18 +144,18 @@ async def test_category_change_cleans_up_old_attachments_directory( logger.error( f"Old attachment directory still exists! PROPFIND returned {status}" ) - assert ( - False - ), f"Expected old attachment directory to be gone, but it still exists (PROPFIND returned {status})!" + assert False, ( + f"Expected old attachment directory to be gone, but it still exists (PROPFIND returned {status})!" + ) # If we got another status code (like 404), it's also good - the directory doesn't exist logger.info( f"Verified old attachment directory does not exist (PROPFIND returned {status})" ) except HTTPStatusError as e: # 404 is expected - directory should not exist - assert ( - e.response.status_code == 404 - ), f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + assert e.response.status_code == 404, ( + f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + ) logger.info( "Verified old attachment directory does not exist via PROPFIND (404 received)" ) @@ -210,17 +210,17 @@ async def test_category_change_cleans_up_old_attachments_directory( logger.error( f"New category attachment directory still exists! PROPFIND returned {status}" ) - assert ( - False - ), f"Expected new category attachment directory to be gone, but it still exists (PROPFIND returned {status})!" + assert False, ( + f"Expected new category attachment directory to be gone, but it still exists (PROPFIND returned {status})!" + ) # If we got another status code (like 404), it's also good - the directory doesn't exist logger.info( f"Verified new category attachment directory does not exist (PROPFIND returned {status})" ) except HTTPStatusError as e: - assert ( - e.response.status_code == 404 - ), f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + assert e.response.status_code == 404, ( + f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + ) logger.info( "Verified new category attachment directory is gone via PROPFIND" ) @@ -241,17 +241,17 @@ async def test_category_change_cleans_up_old_attachments_directory( logger.error( f"Old category attachment directory still exists! PROPFIND returned {status}" ) - assert ( - False - ), f"Expected old category attachment directory to be gone, but it still exists (PROPFIND returned {status})!" + assert False, ( + f"Expected old category attachment directory to be gone, but it still exists (PROPFIND returned {status})!" + ) # If we got another status code (like 404), it's also good - the directory doesn't exist logger.info( f"Verified old category attachment directory does not exist (PROPFIND returned {status})" ) except HTTPStatusError as e: - assert ( - e.response.status_code == 404 - ), f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + assert e.response.status_code == 404, ( + f"Expected PROPFIND to fail with 404, got {e.response.status_code}" + ) logger.info( "Verified old category attachment directory is gone via PROPFIND" )