Fix integration tests

Author: dolfinus

tests/test_integration/test_run_transfer/test_ftp.py

@@ -373,7 +373,8 @@ async def test_run_transfer_postgres_to_ftp_with_full_strategy(
     )
     downloader.run()
 
-    verify_file_name_template(list(Path.iterdir(tmp_path)), expected_extension)
+    file_names = [f.name for f in Path.iterdir(tmp_path) if f.is_file()]
+    verify_file_name_template(file_names, expected_extension)
 
     reader = FileDFReader(
         connection=ftp_file_df_connection,
@@ -433,7 +434,8 @@ async def test_run_transfer_postgres_to_ftp_with_incremental_strategy(
     )
     downloader.run()
 
-    verify_file_name_template(list(Path.iterdir(tmp_path)), expected_extension)
+    file_names = [f.name for f in Path.iterdir(tmp_path) if f.is_file()]
+    verify_file_name_template(file_names, expected_extension)
 
     reader = FileDFReader(
         connection=ftp_file_df_connection,

tests/test_integration/test_run_transfer/test_ftps.py

@@ -241,7 +241,8 @@ async def test_run_transfer_postgres_to_ftps_with_full_strategy(
     )
     downloader.run()
 
-    verify_file_name_template(list(Path.iterdir(tmp_path)), expected_extension)
+    file_names = [f.name for f in Path.iterdir(tmp_path) if f.is_file()]
+    verify_file_name_template(file_names, expected_extension)
 
     reader = FileDFReader(
         connection=ftps_file_df_connection,
@@ -298,7 +299,8 @@ async def test_run_transfer_postgres_to_ftps_with_incremental_strategy(
     )
     downloader.run()
 
-    verify_file_name_template(list(Path.iterdir(tmp_path)), expected_extension)
+    file_names = [f.name for f in Path.iterdir(tmp_path) if f.is_file()]
+    verify_file_name_template(file_names, expected_extension)
 
     reader = FileDFReader(
         connection=ftps_file_df_connection,

tests/test_integration/test_run_transfer/test_s3.py

@@ -295,7 +295,7 @@ async def test_run_transfer_postgres_to_s3_with_full_strategy(
 
     await run_transfer_and_verify(client, group_owner, postgres_to_s3.id, target_auth="s3")
 
-    files = [file.name for file in s3_file_connection.list_dir(target_path)]
+    files = [file for file in s3_file_connection.list_dir(target_path) if file.is_file()]
     verify_file_name_template(files, expected_extension)
 
     reader = FileDFReader(
@@ -357,7 +357,7 @@ async def test_run_transfer_postgres_to_s3_with_incremental_strategy(
     fill_with_data(first_transfer_df)
     await run_transfer_and_verify(client, group_owner, postgres_to_s3.id, target_auth="s3")
 
-    files = [file.name for file in s3_file_connection.list_dir(target_path)]
+    files = [file for file in s3_file_connection.list_dir(target_path)]
     verify_file_name_template(files, expected_extension)
 
     reader = FileDFReader(
@@ -375,7 +375,7 @@ async def test_run_transfer_postgres_to_s3_with_incremental_strategy(
     fill_with_data(second_transfer_df)
     await run_transfer_and_verify(client, group_owner, postgres_to_s3.id, target_auth="s3")
 
-    files = [file.name for file in s3_file_connection.list_dir(target_path)]
+    files = [file.name for file in s3_file_connection.list_dir(target_path) if file.is_file()]
     verify_file_name_template(files, expected_extension)
 
     df_with_increment = reader.run()

tests/test_integration/test_run_transfer/test_samba.py

@@ -241,7 +241,8 @@ async def test_run_transfer_postgres_to_samba_with_full_strategy(
     )
     downloader.run()
 
-    verify_file_name_template(list(Path.iterdir(tmp_path)), expected_extension)
+    file_names = [f.name for f in Path.iterdir(tmp_path) if f.is_file()]
+    verify_file_name_template(file_names, expected_extension)
 
     reader = FileDFReader(
         connection=samba_file_df_connection,
@@ -298,7 +299,8 @@ async def test_run_transfer_postgres_to_samba_with_incremental_strategy(
     )
     downloader.run()
 
-    verify_file_name_template(list(Path.iterdir(tmp_path)), expected_extension)
+    file_names = [f.name for f in Path.iterdir(tmp_path) if f.is_file()]
+    verify_file_name_template(file_names, expected_extension)
 
     reader = FileDFReader(
         connection=samba_file_df_connection,

tests/test_integration/test_run_transfer/test_sftp.py

@@ -247,7 +247,8 @@ async def test_run_transfer_postgres_to_sftp_with_full_strategy(
     )
     downloader.run()
 
-    verify_file_name_template(list(Path.iterdir(tmp_path)), expected_extension)
+    file_names = [f.name for f in Path.iterdir(tmp_path) if f.is_file()]
+    verify_file_name_template(file_names, expected_extension)
 
     reader = FileDFReader(
         connection=sftp_file_df_connection,
@@ -304,7 +305,8 @@ async def test_run_transfer_postgres_to_sftp_with_incremental_strategy(
     )
     downloader.run()
 
-    verify_file_name_template(list(Path.iterdir(tmp_path)), expected_extension)
+    file_names = [f.name for f in Path.iterdir(tmp_path) if f.is_file()]
+    verify_file_name_template(file_names, expected_extension)
 
     reader = FileDFReader(
         connection=sftp_file_df_connection,

tests/test_integration/test_run_transfer/test_webdav.py

@@ -240,7 +240,8 @@ async def test_run_transfer_postgres_to_webdav_with_full_strategy(
     )
     downloader.run()
 
-    verify_file_name_template(list(Path.iterdir(tmp_path)), expected_extension)
+    file_names = [f.name for f in Path.iterdir(tmp_path) if f.is_file()]
+    verify_file_name_template(file_names, expected_extension)
 
     reader = FileDFReader(
         connection=webdav_file_df_connection,
@@ -297,7 +298,8 @@ async def test_run_transfer_postgres_to_webdav_with_incremental_strategy(
     )
     downloader.run()
 
-    verify_file_name_template(list(Path.iterdir(tmp_path)), expected_extension)
+    file_names = [f.name for f in Path.iterdir(tmp_path) if f.is_file()]
+    verify_file_name_template(file_names, expected_extension)
 
     reader = FileDFReader(
         connection=webdav_file_df_connection,

tests/utils.py

@@ -1,8 +1,9 @@
 import asyncio
 import logging
 from datetime import UTC, datetime
-from pathlib import Path
+from pathlib import Path, PurePath, PurePosixPath
 from typing import Any
+from collections.abc import Sequence
 
 from alembic.autogenerate import compare_metadata
 from alembic.config import Config
@@ -247,9 +248,9 @@ def add_increment_to_files_and_upload(file_connection: FileConnection, remote_pa
     uploader.run()
 
 
-def verify_file_name_template(files: list[str], expected_extension: str) -> None:
-    for file in files:
-        run_created_at, index_and_extension = file.split("-")
+def verify_file_name_template(file_names: list[str], expected_extension: str) -> None:
+    for file_name in file_names:
+        run_created_at, index_and_extension = file_name.split("-")
         assert len(run_created_at.split("_")) == 6, f"Got wrong {run_created_at=}"
         assert index_and_extension.split(".", 1)[1] == expected_extension