Merge pull request #49843 from MTecknology/fix-49748

Don't return False when target exists (file.rename)
saltstack · Oct 2, 2018 · e828e2f · e828e2f
2 parents 2d95187 + 92645cf
commit e828e2f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/salt/states/file.py b/salt/states/file.py
@@ -6379,7 +6379,6 @@ def rename(name, source, force=False, makedirs=False):
         if not force:
             ret['comment'] = ('The target file "{0}" exists and will not be '
                               'overwritten'.format(name))
-            ret['result'] = False
             return ret
         elif not __opts__['test']:
             # Remove the destination to prevent problems later

diff --git a/tests/unit/states/test_file.py b/tests/unit/states/test_file.py
@@ -1500,7 +1500,7 @@ def test_rename(self):
             with patch.object(os.path, 'lexists', mock_lex):
                 comt = ('The target file "{0}" exists and will not be '
                         'overwritten'.format(name))
-                ret.update({'comment': comt, 'result': False})
+                ret.update({'comment': comt, 'result': True})
                 self.assertDictEqual(filestate.rename(name, source), ret)
 
         mock_lex = MagicMock(side_effect=[True, True, True])