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

Merge branch '2019.2.1' into zmq_filter_test

Browse source
This commit is contained in:
Megan Wilhite 2019-05-01 10:33:44 -04:00 • committed by GitHub
commit d74b6ee7b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/unit/grains/test_core.py
View file

@ -141,7 +141,6 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
grains = core._windows_platform_data()
keys = ['biosversion',
'osrelease',
'domain',
'kernelrelease',
'motherboard',
'serialnumber',

32
tests/unit/utils/test_win_dacl.py
View file

@ -271,7 +271,6 @@ class WinDaclRegTestCase(TestCase, LoaderModuleMockMixin):
'write_owner']}}},
'comment': '',
'name': self.obj_name,
'pchanges': {'perms': {}},
'result': True}
self.assertDictEqual(result, expected)
@ -334,16 +333,15 @@ class WinDaclRegTestCase(TestCase, LoaderModuleMockMixin):
reset=False)
expected = {
'changes': {'perms': {}},
'changes': {'owner': 'Users',
'perms': {'Backup Operators': {'grant': 'read',
'deny': ['delete']},
'NETWORK SERVICE': {'deny': ['delete',
'set_value',
'write_dac',
'write_owner']}}},
'comment': '',
'name': self.obj_name,
'pchanges': {'owner': 'Users',
'perms': {'Backup Operators': {'grant': 'read',
'deny': ['delete']},
'NETWORK SERVICE': {'deny': ['delete',
'set_value',
'write_dac',
'write_owner']}}},
'result': None}
self.assertDictEqual(result, expected)
@ -573,7 +571,6 @@ class WinDaclFileTestCase(TestCase, LoaderModuleMockMixin):
'write_data']}}},
'comment': '',
'name': self.obj_name,
'pchanges': {'perms': {}},
'result': True}
self.assertDictEqual(result, expected)
@ -636,16 +633,15 @@ class WinDaclFileTestCase(TestCase, LoaderModuleMockMixin):
reset=False)
expected = {
'changes': {'perms': {}},
'changes': {'owner': 'Users',
'perms': {'Backup Operators': {'grant': 'read',
'deny': ['delete']},
'NETWORK SERVICE': {'deny': ['delete',
'set_value',
'write_dac',
'write_owner']}}},
'comment': '',
'name': self.obj_name,
'pchanges': {'owner': 'Users',
'perms': {'Backup Operators': {'grant': 'read',
'deny': ['delete']},
'NETWORK SERVICE': {'deny': ['delete',
'set_value',
'write_dac',
'write_owner']}}},
'result': None}
self.assertDictEqual(result, expected)