From a5c3c184423b76823c8c35c147be58677077144a Mon Sep 17 00:00:00 2001 From: twangboy Date: Thu, 12 Sep 2024 13:27:44 -0600 Subject: [PATCH] Fix unit test on Linux --- salt/states/file.py | 2 +- tests/pytests/unit/states/file/test_recurse.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/salt/states/file.py b/salt/states/file.py index e4d9b7ece98..6d8c43b02b0 100644 --- a/salt/states/file.py +++ b/salt/states/file.py @@ -568,7 +568,7 @@ def _gen_recurse_managed_files( for file_dest, file_src in managed_files: # We need to convert relpath to fullpath. We're using pathlib to # be platform-agnostic - symlink_full_path = pathlib.Path(f"{name}\\{link_src_relpath}") + symlink_full_path = pathlib.Path(f"{name}{os.sep}{link_src_relpath}") file_dest_full_path = pathlib.Path(file_dest) if symlink_full_path == file_dest_full_path: new_managed_files.append( diff --git a/tests/pytests/unit/states/file/test_recurse.py b/tests/pytests/unit/states/file/test_recurse.py index dbbf1e1d2fe..53e6e0fd22f 100644 --- a/tests/pytests/unit/states/file/test_recurse.py +++ b/tests/pytests/unit/states/file/test_recurse.py @@ -1,4 +1,5 @@ import logging +import os import pathlib import pytest @@ -18,7 +19,7 @@ def test__gen_recurse_managed_files(): """ Test _gen_recurse_managed_files to make sure it puts symlinks at the end of the list of files. """ - target_dir = pathlib.Path("\\some\\path\\target") + target_dir = pathlib.Path(f"{os.sep}some{os.sep}path{os.sep}target") cp_list_master = MagicMock( return_value=[ "target/symlink", @@ -28,7 +29,9 @@ def test__gen_recurse_managed_files(): ], ) cp_list_master_symlinks = MagicMock( - return_value={"target/symlink": f"{target_dir}\\not_a_symlink\\symlink"} + return_value={ + "target/symlink": f"{target_dir}{os.sep}not_a_symlink{os.sep}symlink" + } ) patch_salt = { "cp.list_master": cp_list_master, @@ -38,5 +41,8 @@ def test__gen_recurse_managed_files(): files, dirs, links, keep = filestate._gen_recurse_managed_files( name=str(target_dir), source=f"salt://{target_dir.name}", keep_symlinks=True ) - expected = ("\\some\\path\\target\\symlink", "salt://target/symlink?saltenv=base") + expected = ( + f"{os.sep}some{os.sep}path{os.sep}target{os.sep}symlink", + "salt://target/symlink?saltenv=base", + ) assert files[-1] == expected