saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use salt.utils.platform.is_windows

Browse source
This commit is contained in:
Daniel A. Wozniak 2018-07-24 16:18:04 -07:00
parent 33e48f7ad7
commit 3a941055c1
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/unit/states/test_file.py
View file

@ -61,7 +61,7 @@ class TestFileState(TestCase, LoaderModuleMockMixin):
def tearDown(self):
remove_dir = '/tmp/etc'
if salt.utils.is_windows():
if salt.utils.platform.is_windows():
remove_dir = 'c:\\tmp\\etc'
try:
salt.utils.rm_rf(remove_dir)
@ -1187,7 +1187,7 @@ class TestFileState(TestCase, LoaderModuleMockMixin):
Test to ensure that some text appears at the beginning of a file.
'''
name = '/tmp/etc/motd'
if salt.utils.is_windows():
if salt.utils.platform.is_windows():
name = 'c:\\tmp\\etc\\motd'
assert not os.path.exists(os.path.split(name)[0])
source = ['salt://motd/hr-messages.tmpl']
@ -1222,7 +1222,7 @@ class TestFileState(TestCase, LoaderModuleMockMixin):
comt = ('The following files will be changed:\n/tmp/etc:'
' directory - new\n')
pchanges = {'/tmp/etc': {'directory': 'new'}}
if salt.utils.is_windows():
if salt.utils.platform.is_windows():
comt = 'The directory "c:\\tmp\\etc" will be changed'
pchanges = {'c:\\tmp\\etc': {'directory': 'new'}}
ret.update({'comment': comt, 'name': name, 'pchanges': pchanges})