From 6de541f5602ac263f27e7a8d2ad3f40630442374 Mon Sep 17 00:00:00 2001 From: "Daniel G, Krakowczyk" Date: Fri, 22 Sep 2023 14:26:17 +0200 Subject: [PATCH] windows made me unhappy --- tests/utils/archives_test.py | 43 ++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/tests/utils/archives_test.py b/tests/utils/archives_test.py index 3a5a50b36..fc6da14ab 100644 --- a/tests/utils/archives_test.py +++ b/tests/utils/archives_test.py @@ -208,24 +208,37 @@ def fixture_unsupported_archive(request, tmp_path): [ pytest.param( False, False, - ('toplevel', 'toplevel/recursive.zip'), + ( + 'toplevel', + os.path.join('toplevel', 'recursive.zip'), + ), id='recursive_false_remove_finished_false', ), pytest.param( False, True, - ('toplevel', 'toplevel/recursive.zip'), + ( + 'toplevel', + os.path.join('toplevel', 'recursive.zip'), + ), id='recursive_false_remove_finished_true', ), pytest.param( True, False, ( - 'toplevel', 'toplevel/recursive.zip', 'toplevel/recursive', - 'toplevel/recursive/test.file', + 'toplevel', + os.path.join('toplevel', 'recursive.zip'), + os.path.join('toplevel', 'recursive'), + os.path.join('toplevel', 'recursive', 'test.file'), ), id='recursive_true_remove_finished_false', ), pytest.param( True, True, + ( + 'toplevel', + os.path.join('toplevel', 'recursive'), + os.path.join('toplevel', 'recursive', 'test.file'), + ), ('toplevel', 'toplevel/recursive', 'toplevel/recursive/test.file'), id='recursive_true_remove_finished_true', ), @@ -314,25 +327,37 @@ def test_extract_unsupported_archive_destination_path_None( [ pytest.param( False, False, - ('toplevel', 'toplevel/recursive.zip'), + ( + 'toplevel', + os.path.join('toplevel', 'recursive.zip'), + ), id='recursive_false_remove_finished_false', ), pytest.param( False, True, - ('toplevel', 'toplevel/recursive.zip'), + ( + 'toplevel', + os.path.join('toplevel', 'recursive.zip'), + ), id='recursive_false_remove_finished_true', ), pytest.param( True, False, ( - 'toplevel', 'toplevel/recursive.zip', 'toplevel/recursive', - 'toplevel/recursive/test.file', + 'toplevel', + os.path.join('toplevel', 'recursive.zip'), + os.path.join('toplevel', 'recursive'), + os.path.join('toplevel', 'recursive', 'test.file'), ), id='recursive_true_remove_finished_false', ), pytest.param( True, True, - ('toplevel', 'toplevel/recursive', 'toplevel/recursive/test.file'), + ( + 'toplevel', + os.path.join('toplevel', 'recursive'), + os.path.join('toplevel', 'recursive', 'test.file'), + ), id='recursive_true_remove_finished_true', ), ],