custom module deadlock import fix (#1077)

pull/1080/head
Chris Caron 9 months ago committed by GitHub
parent b4798e31b3
commit d5cbab19ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -365,7 +365,6 @@ class PluginManager(metaclass=Singleton):
# end of _import_module()
return
with self._lock:
for _path in paths:
path = os.path.abspath(os.path.expanduser(_path))
if (cache and path in self._paths_previously_scanned) \

@ -615,6 +615,68 @@ def test_apprise_cli_nux_env(tmpdir):
assert result.exit_code == 0
def test_apprise_cli_modules(tmpdir):
"""
CLI: --plugin (-P)
"""
runner = CliRunner()
#
# Loading of modules works correctly
#
notify_cmod_base = tmpdir.mkdir('cli_modules')
notify_cmod = notify_cmod_base.join('hook.py')
notify_cmod.write(cleandoc("""
from apprise.decorators import notify
@notify(on="climod")
def mywrapper(body, title, notify_type, *args, **kwargs):
pass
"""))
result = runner.invoke(cli.main, [
'--plugin-path', str(notify_cmod),
'-t', 'title',
'-b', 'body',
'climod://',
])
assert result.exit_code == 0
# Test -P
result = runner.invoke(cli.main, [
'-P', str(notify_cmod),
'-t', 'title',
'-b', 'body',
'climod://',
])
assert result.exit_code == 0
# Test double hooks
notify_cmod2 = notify_cmod_base.join('hook2.py')
notify_cmod2.write(cleandoc("""
from apprise.decorators import notify
@notify(on="climod2")
def mywrapper(body, title, notify_type, *args, **kwargs):
pass
"""))
result = runner.invoke(cli.main, [
'--plugin-path', str(notify_cmod),
'--plugin-path', str(notify_cmod2),
'-t', 'title',
'-b', 'body',
'climod://',
'climod2://',
])
assert result.exit_code == 0
def test_apprise_cli_details(tmpdir):
"""
CLI: --details (-l)

Loading…
Cancel
Save