Skip to content

Commit 9a8c478

Browse files
committed
Fix tests
1 parent 21d77e9 commit 9a8c478

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

tests/test_integration/test_run_transfer/test_hdfs.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ async def test_run_transfer_postgres_to_hdfs_with_full_strategy(
248248

249249
await run_transfer_and_verify(client, group_owner, postgres_to_hdfs.id)
250250

251-
files = [file for file in hdfs_file_connection.list_dir(target_path) if file.is_file()]
251+
files = [file.name for file in hdfs_file_connection.list_dir(target_path) if file.is_file()]
252252
verify_file_name_template(files, expected_extension)
253253

254254
spark.catalog.clearCache()
@@ -304,7 +304,7 @@ async def test_run_transfer_postgres_to_hdfs_with_incremental_strategy(
304304
fill_with_data(first_transfer_df)
305305
await run_transfer_and_verify(client, group_owner, postgres_to_hdfs.id)
306306

307-
files = [file for file in hdfs_file_connection.list_dir(target_path) if file.is_file()]
307+
files = [file.name for file in hdfs_file_connection.list_dir(target_path) if file.is_file()]
308308
verify_file_name_template(files, expected_extension)
309309

310310
spark.catalog.clearCache()
@@ -323,7 +323,7 @@ async def test_run_transfer_postgres_to_hdfs_with_incremental_strategy(
323323
fill_with_data(second_transfer_df)
324324
await run_transfer_and_verify(client, group_owner, postgres_to_hdfs.id)
325325

326-
files = [file for file in hdfs_file_connection.list_dir(target_path) if file.is_file()]
326+
files = [file.name for file in hdfs_file_connection.list_dir(target_path) if file.is_file()]
327327
verify_file_name_template(files, expected_extension)
328328

329329
spark.catalog.clearCache()

tests/test_integration/test_run_transfer/test_s3.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ async def test_run_transfer_postgres_to_s3_with_full_strategy(
283283

284284
await run_transfer_and_verify(client, group_owner, postgres_to_s3.id, target_auth="s3")
285285

286-
files = [file for file in s3_file_connection.list_dir(target_path)]
286+
files = [file.name for file in s3_file_connection.list_dir(target_path)]
287287
verify_file_name_template(files, expected_extension)
288288

289289
reader = FileDFReader(
@@ -339,7 +339,7 @@ async def test_run_transfer_postgres_to_s3_with_incremental_strategy(
339339
fill_with_data(first_transfer_df)
340340
await run_transfer_and_verify(client, group_owner, postgres_to_s3.id, target_auth="s3")
341341

342-
files = [file for file in s3_file_connection.list_dir(target_path)]
342+
files = [file.name for file in s3_file_connection.list_dir(target_path)]
343343
verify_file_name_template(files, expected_extension)
344344

345345
reader = FileDFReader(
@@ -357,7 +357,7 @@ async def test_run_transfer_postgres_to_s3_with_incremental_strategy(
357357
fill_with_data(second_transfer_df)
358358
await run_transfer_and_verify(client, group_owner, postgres_to_s3.id, target_auth="s3")
359359

360-
files = [file for file in s3_file_connection.list_dir(target_path)]
360+
files = [file.name for file in s3_file_connection.list_dir(target_path)]
361361
verify_file_name_template(files, expected_extension)
362362

363363
df_with_increment = reader.run()

tests/utils.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from httpx import AsyncClient
1313
from onetl.connection import FileConnection
1414
from onetl.file import FileDownloader, FileUploader
15-
from onetl.impl import RemoteFile
1615
from pyspark.sql import DataFrame
1716
from pyspark.sql.functions import (
1817
col,
@@ -241,9 +240,9 @@ def add_increment_to_files_and_upload(file_connection: FileConnection, remote_pa
241240
uploader.run()
242241

243242

244-
def verify_file_name_template(files: list[RemoteFile], expected_extension: str) -> None:
243+
def verify_file_name_template(files: list[str], expected_extension: str) -> None:
245244
for file in files:
246-
run_created_at, index_and_extension = file.name.split("-")
245+
run_created_at, index_and_extension = file.split("-")
247246
assert len(run_created_at.split("_")) == 6, f"Got wrong {run_created_at=}"
248247
assert index_and_extension.split(".", 1)[1] == expected_extension
249248

0 commit comments

Comments
 (0)