Merge pull request #47162 from terminalmage/bp-47161

Partial backport of #47161 to 2018.3 branch
This commit is contained in:
Nicole Thomas 2018-04-19 15:28:46 -04:00 committed by GitHub
commit 291cca7ed8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -439,8 +439,8 @@ class PillarTestCase(TestCase):
'renderer_blacklist': [],
'renderer_whitelist': [],
'state_top': '',
'pillar_roots': [],
'file_roots': [],
'pillar_roots': {},
'file_roots': {},
'extension_modules': ''
}
grains = {