From f1e67c3328a8e03c9810c43431ebb5b62b97ec00 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Fri, 15 Feb 2019 22:58:26 +0100 Subject: [PATCH] Bugfix/ fix mocker patch in tests (#52372) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🐛 Fix invalid os.stat mock in tests * 🐛 Fix leaking mock patch in tests Closes #52347 --- test/units/module_utils/basic/test_atomic_move.py | 2 +- test/units/module_utils/basic/test_set_mode_if_different.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test/units/module_utils/basic/test_atomic_move.py b/test/units/module_utils/basic/test_atomic_move.py index d1dc4d76762..1dea91702ce 100644 --- a/test/units/module_utils/basic/test_atomic_move.py +++ b/test/units/module_utils/basic/test_atomic_move.py @@ -197,7 +197,7 @@ def test_rename_perms_fail_temp_succeeds(atomic_am, atomic_mocks, fake_stat, moc mock_context = atomic_am.selinux_default_context.return_value atomic_mocks['path_exists'].return_value = False atomic_mocks['rename'].side_effect = [OSError(errno.EPERM, 'failing with EPERM'), None] - atomic_mocks['stat'].return_value = [fake_stat, fake_stat, fake_stat] + atomic_mocks['stat'].return_value = fake_stat atomic_mocks['stat'].side_effect = None atomic_mocks['mkstemp'].return_value = (None, '/path/to/tempfile') atomic_mocks['mkstemp'].side_effect = None diff --git a/test/units/module_utils/basic/test_set_mode_if_different.py b/test/units/module_utils/basic/test_set_mode_if_different.py index 7035f4c6879..e9446cd83e3 100644 --- a/test/units/module_utils/basic/test_set_mode_if_different.py +++ b/test/units/module_utils/basic/test_set_mode_if_different.py @@ -151,3 +151,6 @@ def test_missing_lchmod_is_link(am, mock_stats, mocker, check_mode): assert not m_chmod.called else: m_chmod.assert_called_with(b'/path/to/file/no_lchmod', 0o660) + + mocker.resetall() + mocker.stopall()