Merge pull request #46227 from Ch3LL/smtp_file_client

Mock file_client call in smtp return test
This commit is contained in:
Nicole Thomas 2018-02-28 17:12:22 -05:00 committed by GitHub
commit 7382654c70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -17,6 +17,7 @@ from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
# Import salt libs
import salt.returners.smtp_return as smtp
from salt.utils.jinja import SaltCacheLoader
try:
import gnupg # pylint: disable=unused-import
@ -54,7 +55,8 @@ class SMTPReturnerTestCase(TestCase, LoaderModuleMockMixin):
'gpgowner': '',
'subject': ''}
with patch('salt.returners.smtp_return._get_options', MagicMock(return_value=options)):
with patch('salt.returners.smtp_return._get_options', MagicMock(return_value=options)), \
patch.object(SaltCacheLoader, 'file_client', MagicMock()):
smtp.returner(ret)
self.assertTrue(mocked_smtplib.return_value.sendmail.called)