mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Fix/skip tests on RHEL/Windows
This commit is contained in:
parent
9269d6d7a6
commit
b69fe967b5
3 changed files with 6 additions and 2 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
|
||||
import sys
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Add table
Reference in a new issue