Merge pull request #46693 from dwoz/test_smtp_return

File and Pillar roots are dictionaries
This commit is contained in:
Nicole Thomas 2018-03-26 11:15:37 -04:00 committed by GitHub
commit 6c80d90bb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -64,8 +64,8 @@ class SMTPReturnerTestCase(TestCase, LoaderModuleMockMixin):
'renderer': 'jinja|yaml',
'renderer_blacklist': [],
'renderer_whitelist': [],
'file_roots': [],
'pillar_roots': [],
'file_roots': {},
'pillar_roots': {},
'cachedir': '/'}), \
patch('salt.returners.smtp_return.gnupg'), \
patch('salt.returners.smtp_return.smtplib.SMTP') as mocked_smtplib:
@ -77,8 +77,8 @@ class SMTPReturnerTestCase(TestCase, LoaderModuleMockMixin):
'renderer': 'jinja|yaml',
'renderer_blacklist': [],
'renderer_whitelist': [],
'file_roots': [],
'pillar_roots': [],
'file_roots': {},
'pillar_roots': {},
'cachedir': '/'}), \
patch('salt.returners.smtp_return.smtplib.SMTP') as mocked_smtplib:
self._test_returner(mocked_smtplib)