Changed returned result when using test=true for mongodb_user.present…

… to avoid false positives.
saltstack · Jul 24, 2019 · 889cc14 · 889cc14
1 parent c3950a2
commit 889cc14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/salt/states/mongodb_user.py b/salt/states/mongodb_user.py
@@ -106,9 +106,6 @@ def present(name,
             return ret
 
         if __opts__['test']:
-            ret['result'] = None
-            ret['comment'] = ('User {0} is already present and should be updated if neccesary.'
-                    ).format(name)
             return ret
 
         # check each user occurrence

diff --git a/tests/unit/states/test_mongodb_user.py b/tests/unit/states/test_mongodb_user.py
@@ -95,15 +95,15 @@ def test_present_existing_user(self):
                          'mongodb.user_create': mock_t,
                          'mongodb.user_find': mock
                         }):
-            comt = ('User {0} is already present and should be updated if neccesary.'
+            comt = ('User {0} is already present'
                 ).format(name)
-            ret.update({'comment': comt, 'result': None})
+            ret.update({'comment': comt, 'result': True})
             self.assertDictEqual(mongodb_user.present(name, passwd, database=db, roles=new_role), ret)
 
             with patch.dict(mongodb_user.__opts__, {'test': True}):
-                comt = ('User {0} is already present and should be updated if neccesary.'
+                comt = ('User {0} is already present'
                         .format(name))
-                ret.update({'comment': comt, 'result': None})
+                ret.update({'comment': comt, 'result': True})
                 self.assertDictEqual(mongodb_user.present(name, passwd, database=db, roles=new_role), ret)
 
             with patch.dict(mongodb_user.__opts__, {'test': False}):