Merge pull request #54546 from garethgreenaway/2019_2_1_port_49843

[master] Porting #49843 to master
saltstack · Nov 14, 2019 · b9a52de · b9a52de
2 parents cf57c21 + c766c52
commit b9a52de
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
@@ -6417,7 +6417,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
@@ -1524,7 +1524,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])