cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #15281 from jpic/fix_plugin_configuration

Browse source 
Regression fix: proper plugin configuration was reset
This commit is contained in:
Matt Davis 2016-04-05 10:00:40 -07:00
parent 0f2b1244d2 4985411816
commit 6a3670b1f0
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/plugins/__init__.py
View file

@ -66,7 +66,7 @@ class PluginLoader:
if config and not isinstance(config, list):
config = [config]
else:
elif not config:
config = []
self.config = config

13
test/units/plugins/test_plugins.py
View file

@ -75,3 +75,16 @@ class TestErrors(unittest.TestCase):
#with patch('glob.glob', mock_glob):
# pass
def assertPluginLoaderConfigBecomes(self, arg, expected):
pl = PluginLoader('test', '', arg, 'test_plugin')
self.assertEqual(pl.config, expected)
def test_plugin__init_config_list(self):
config = ['/one', '/two']
self.assertPluginLoaderConfigBecomes(config, config)
def test_plugin__init_config_str(self):
self.assertPluginLoaderConfigBecomes('test', ['test'])
def test_plugin__init_config_none(self):
self.assertPluginLoaderConfigBecomes(None, [])