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

Update old utils paths to use new utils paths

Browse source
This commit is contained in:
rallytime 2018-06-01 15:00:46 -04:00
parent 3273bbdab7
commit 7e1d278d19
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/junos.py
View file

@ -25,6 +25,7 @@ except ImportError:
from salt._compat import ElementTree as etree
# Import Salt libs
import salt.utils.args
import salt.utils.files
import salt.utils.json
import salt.utils.stringutils
@ -505,10 +506,10 @@ def diff(**kwargs):
salt 'device_name' junos.diff 3
'''
kwargs = salt.utils.clean_kwargs(**kwargs)
kwargs = salt.utils.args.clean_kwargs(**kwargs)
id_ = kwargs.pop('id', 0)
if kwargs:
salt.utils.invalid_kwargs(kwargs)
salt.utils.args.invalid_kwargs(kwargs)
conn = __proxy__['junos.conn']()
ret = dict()

2
tests/integration/modules/test_cmdmod.py
View file

@ -352,7 +352,7 @@ class CMDModuleTest(ModuleCase):
test return of whoami
'''
cmd = self.run_function('cmd.run', ['whoami'])
if salt.utils.is_windows():
if salt.utils.platform.is_windows():
self.assertIn('administrator', cmd)
else:
self.assertEqual('root', cmd)

14
tests/integration/states/test_user.py
View file

@ -27,7 +27,7 @@ if salt.utils.platform.is_darwin():
GROUP = 'macuser'
GID = randint(400, 500)
NOGROUPGID = randint(400, 500)
elif salt.utils.is_windows():
elif salt.utils.platform.is_windows():
USER = 'winuser'
GROUP = 'winuser'
GID = randint(400, 500)
@ -48,7 +48,7 @@ class UserTest(ModuleCase, SaltReturnAssertsMixin):
test for user absent
'''
user_name = 'salt-test'
user_home = '/var/lib/{0}'.format(user_name) if not salt.utils.is_windows() else os.path.join('tmp', user_name)
user_home = '/var/lib/{0}'.format(user_name) if not salt.utils.platform.is_windows() else os.path.join('tmp', user_name)
def test_user_absent(self):
ret = self.run_state('user.absent', name='unpossible')
@ -118,12 +118,12 @@ class UserTest(ModuleCase, SaltReturnAssertsMixin):
self.assertEqual(group_name, 'users')
elif grains['os_family'] == 'MacOS':
self.assertEqual(group_name, 'staff')
elif salt.utils.is_windows():
elif salt.utils.platform.is_windows():
self.assertEqual([], group_name)
else:
self.assertEqual(group_name, self.user_name)
@skipIf(salt.utils.is_windows(), 'windows minion does not support gid_from_name')
@skipIf(salt.utils.platform.is_windows(), 'windows minion does not support gid_from_name')
@requires_system_grains
def test_user_present_gid_from_name_default(self, grains=None):
'''
@ -158,7 +158,7 @@ class UserTest(ModuleCase, SaltReturnAssertsMixin):
else:
self.assertEqual(group_name, self.user_name)
@skipIf(salt.utils.is_windows(), 'windows minion does not support gid_from_name')
@skipIf(salt.utils.platform.is_windows(), 'windows minion does not support gid_from_name')
def test_user_present_gid_from_name(self):
'''
This is a DESTRUCTIVE TEST it creates a new user on the on the minion.
@ -211,7 +211,7 @@ class UserTest(ModuleCase, SaltReturnAssertsMixin):
)
self.assertSaltTrueReturn(ret)
@skipIf('salt.utils.is_windows', 'windows minon does not support roomnumber or phone')
@skipIf(salt.utils.platform.is_windows(), 'windows minon does not support roomnumber or phone')
def test_user_present_gecos(self):
'''
This is a DESTRUCTIVE TEST it creates a new user on the on the minion.
@ -231,7 +231,7 @@ class UserTest(ModuleCase, SaltReturnAssertsMixin):
)
self.assertSaltTrueReturn(ret)
@skipIf('salt.utils.is_windows', 'windows minon does not support roomnumber or phone')
@skipIf(salt.utils.platform.is_windows(), 'windows minon does not support roomnumber or phone')
def test_user_present_gecos_none_fields(self):
'''
This is a DESTRUCTIVE TEST it creates a new user on the on the minion.