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 #50092 from rallytime/merge-2018.3

Browse source 
[2018.3] Merge forward from 2017.7 to 2018.3
This commit is contained in:
Nicole Thomas 2018-10-17 15:57:06 -04:00 • committed by GitHub
commit aa94f6009d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/grains/core.py
View file

@ -610,6 +610,8 @@ def _windows_virtual(osdata):
if osdata['kernel'] != 'Windows':
return grains
grains['virtual'] = 'physical'
# It is possible that the 'manufacturer' and/or 'productname' grains
# exist but have a value of None.
manufacturer = osdata.get('manufacturer', '')

6
tests/integration/modules/test_groupadd.py
View file

@ -249,7 +249,11 @@ class GroupModuleTest(ModuleCase):
self.run_function('user.add', [self._user])
self.run_function('user.add', [self._user1])
m = '{0},{1}'.format(self._user, self._user1)
self.assertTrue(self.run_function('group.members', [self._group, m]))
ret = self.run_function('group.members', [self._group, m])
if salt.utils.platform.is_windows():
self.assertTrue(ret['result'])
else:
self.assertTrue(ret)
group_info = self.run_function('group.info', [self._group])
self.assertIn(self._user, str(group_info['members']))
self.assertIn(self._user1, str(group_info['members']))