This commit is contained in:
Erik Johnson 2018-06-13 21:10:30 -05:00
parent db19636f56
commit 767cc7e87f
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F

View file

@ -275,9 +275,9 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
# Skip all the /etc/*-release stuff (not pertinent)
# - Mock linux_distribution to give us the OS name that we want.
# Mock the osarch
distro_mock = MagicMock(return_value=os_release_map['linux_distribution'])
distro_mock = MagicMock(return_value=os_release_map['linux_distribution'])
with patch.object(salt.utils.platform, 'is_proxy', MagicMock(return_value=False)), \
patch.object(core, '_linux_bin_exists', MagicMock(return_value=False)), \
patch.object(core, '_linux_bin_exists', MagicMock(return_value=False)), \
patch.object(os.path, 'exists', path_isfile_mock), \
patch('{0}.__import__'.format(built_in), side_effect=_import_mock), \
patch.object(os.path, 'isfile', path_isfile_mock), \