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

Merge pull request #43757 from eradman/is_windows

Browse source 
Fix DeprecationWarning for use of 'salt.utils.is_windows'
This commit is contained in:
Nicole Thomas 2017-09-27 10:47:20 -04:00 • committed by GitHub
commit 92c10689e4
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/kubernetes.py
View file

@ -83,7 +83,7 @@ def __virtual__():
return False, 'python kubernetes library not found'
if not salt.utils.is_windows():
if not salt.utils.platform.is_windows():
@contextmanager
def _time_limit(seconds):
def signal_handler(signum, frame):
@ -713,7 +713,7 @@ def delete_deployment(name, namespace='default', **kwargs):
namespace=namespace,
body=body)
mutable_api_response = api_response.to_dict()
if not salt.utils.is_windows():
if not salt.utils.platform.is_windows():
try:
with _time_limit(POLLING_TIME_LIMIT):
while show_deployment(name, namespace) is not None:

4
tests/unit/modules/test_hosts.py
View file

@ -94,7 +94,7 @@ class HostsTestCase(TestCase, LoaderModuleMockMixin):
Tests true if the alias is set
'''
hosts_file = '/etc/hosts'
if salt.utils.is_windows():
if salt.utils.platform.is_windows():
hosts_file = r'C:\Windows\System32\Drivers\etc\hosts'
with patch('salt.modules.hosts.__get_hosts_filename',
@ -198,7 +198,7 @@ class HostsTestCase(TestCase, LoaderModuleMockMixin):
Tests if specified host entry gets added from the hosts file
'''
hosts_file = '/etc/hosts'
if salt.utils.is_windows():
if salt.utils.platform.is_windows():
hosts_file = r'C:\Windows\System32\Drivers\etc\hosts'
with patch('salt.utils.files.fopen', mock_open()), \

2
tests/unit/returners/test_local_cache.py
View file

@ -97,7 +97,7 @@ class LocalCacheCleanOldJobsTestCase(TestCase, LoaderModuleMockMixin):
local_cache.clean_old_jobs()
# Get the name of the JID directory that was created to test against
if salt.utils.is_windows():
if salt.utils.platform.is_windows():
jid_dir_name = jid_dir.rpartition('\\')[2]
else:
jid_dir_name = jid_dir.rpartition('/')[2]