mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-26 20:31:27 -07:00
Fix ziploader for the cornercase of ansible invoking ansible.
* Make ziploader's ansible and ansible.module_utils libraries into namespace packages. * Move __version__ and __author__ from ansible/__init__ to ansible/release.py. This is because namespace packages only load one __init__.py. If that is not the __init__.py with the author and version info then those won't be available. * In ziplaoder, move the version ito ANSIBLE_CONSTANTS. * Change PluginLoader to properly construct the path to the plugins even when namespace packages are present.
This commit is contained in:
parent
7af47a3886
commit
487e6562ca
11 changed files with 53 additions and 22 deletions
|
@ -53,11 +53,15 @@ class TestErrors(unittest.TestCase):
|
|||
# python library, and then uses the __file__ attribute of
|
||||
# the result for that to get the library path, so we mock
|
||||
# that here and patch the builtin to use our mocked result
|
||||
m = MagicMock()
|
||||
m.return_value.__file__ = '/path/to/my/test.py'
|
||||
foo = MagicMock()
|
||||
bar = MagicMock()
|
||||
bam = MagicMock()
|
||||
bam.__file__ = '/path/to/my/foo/bar/bam/__init__.py'
|
||||
bar.bam = bam
|
||||
foo.return_value.bar = bar
|
||||
pl = PluginLoader('test', 'foo.bar.bam', 'test', 'test_plugin')
|
||||
with patch('{0}.__import__'.format(BUILTINS), m):
|
||||
self.assertEqual(pl._get_package_paths(), ['/path/to/my/bar/bam'])
|
||||
with patch('{0}.__import__'.format(BUILTINS), foo):
|
||||
self.assertEqual(pl._get_package_paths(), ['/path/to/my/foo/bar/bam'])
|
||||
|
||||
def test_plugins__get_paths(self):
|
||||
pl = PluginLoader('test', '', 'test', 'test_plugin')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue