From 1de9357c2fc27114611c6c027f13654e66dcfee9 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Tue, 1 Mar 2016 14:06:58 -0500 Subject: [PATCH] Attempt at cleaning up issues introduced by new basic.py unit tests --- test/units/module_utils/test_basic.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/units/module_utils/test_basic.py b/test/units/module_utils/test_basic.py index 04556736b62..3088ba67530 100644 --- a/test/units/module_utils/test_basic.py +++ b/test/units/module_utils/test_basic.py @@ -88,6 +88,8 @@ class TestModuleUtilsBasic(unittest.TestCase): def _mock_import(name, *args, **kwargs): if name == 'json': raise ImportError + elif name == 'simplejson': + return MagicMock() return realimport(name, *args, **kwargs) self.clear_modules(['json', 'ansible.module_utils.basic']) @@ -109,8 +111,7 @@ class TestModuleUtilsBasic(unittest.TestCase): return realimport(name, *args, **kwargs) mock_import.side_effect = _mock_import - del sys.modules['ast'] - del sys.modules['ansible.module_utils.basic'] + self.clear_modules(['ast', 'ansible.module_utils.basic']) mod = builtins.__import__('ansible.module_utils.basic') self.assertEqual(mod.module_utils.basic.literal_eval("'1'"), "1") self.assertEqual(mod.module_utils.basic.literal_eval("1"), 1)