Fix/skip tests on RHEL/Windows

This commit is contained in:
jeanluc 2023-11-06 23:28:30 +01:00 committed by Daniel Wozniak
parent 9269d6d7a6
commit b69fe967b5
3 changed files with 6 additions and 2 deletions

View file

@ -934,7 +934,10 @@ class SSHCpClient(salt.fileclient.FSClient):
elif master:
# The root cachedir on the master-side should not be overridden
cachedir = os.path.join(
self.opts["cachedir"], *prefix, "absolute_root", cachedir[1:]
self.opts["cachedir"],
*prefix,
"absolute_root",
str(Path(*cachedir.split(os.sep)[1:])),
)
return cachedir

View file

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
import sys

View file

@ -23,6 +23,7 @@ from tests.support.mock import Mock, call, patch
log = logging.getLogger(__name__)
pytestmark = [pytest.mark.skip_on_windows]
SUBDIR = "subdir"
TGT = "testtarget"