Merge pull request #52768 from twangboy/fix_test_win_dacl

Remove pchanges... again...
saltstack · Apr 30, 2019 · 30dc14b · 30dc14b
2 parents 3e46f51 + 123b607
commit 30dc14b
Showing 1 changed file with 14 additions and 18 deletions.
diff --git a/tests/unit/utils/test_win_dacl.py b/tests/unit/utils/test_win_dacl.py
@@ -271,7 +271,6 @@ def test_check_perms(self):
                                                                        'write_owner']}}},
                     'comment': '',
                     'name': self.obj_name,
-                    'pchanges': {'perms': {}},
                     'result': True}
         self.assertDictEqual(result, expected)
 
@@ -334,16 +333,15 @@ def test_check_perms_test_true(self):
                 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 @@ def test_check_perms(self):
                                                                'write_data']}}},
             'comment': '',
             'name': self.obj_name,
-            'pchanges': {'perms': {}},
             'result': True}
         self.assertDictEqual(result, expected)
 
@@ -636,16 +633,15 @@ def test_check_perms_test_true(self):
                 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)