From 52050f6f9fce4cab24dcd13d2fe89be5aa13cefa Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 11 Feb 2022 12:15:56 +0000 Subject: [PATCH] Use salt's entry-points instead of relying on loader ``*_dirs`` configs Fixes #98 Signed-off-by: Pedro Algarvio --- changelog/98.bugfix.rst | 1 + setup.cfg | 2 ++ src/saltfactories/manager.py | 10 ---------- 3 files changed, 3 insertions(+), 10 deletions(-) create mode 100644 changelog/98.bugfix.rst diff --git a/changelog/98.bugfix.rst b/changelog/98.bugfix.rst new file mode 100644 index 00000000..72836d70 --- /dev/null +++ b/changelog/98.bugfix.rst @@ -0,0 +1 @@ +Use salt's entry-points instead of relying on loader ``*_dirs`` configs diff --git a/setup.cfg b/setup.cfg index 900d1f15..81e23a84 100644 --- a/setup.cfg +++ b/setup.cfg @@ -67,6 +67,8 @@ pytest11= salt-factories-event-listener = saltfactories.plugins.event_listener salt-factories-log-server = saltfactories.plugins.log_server salt-factories-loader-mock = saltfactories.plugins.loader +salt.loader = + salt-factories = saltfactories.utils.saltext [bdist_wheel] universal = false diff --git a/src/saltfactories/manager.py b/src/saltfactories/manager.py index d67177ac..5e74fe35 100644 --- a/src/saltfactories/manager.py +++ b/src/saltfactories/manager.py @@ -145,20 +145,10 @@ def final_common_config_tweaks(self, config, role): if "pytest" not in config["engines"]: config["engines"].append("pytest") - if "engines_dirs" not in config: - config["engines_dirs"] = [] - config["engines_dirs"].insert(0, str(FactoriesManager.get_salt_engines_path())) config.setdefault("user", running_username()) if not config["user"]: # pragma: no cover # If this value is empty, None, False, just remove it config.pop("user") - if "log_forwarding_consumer" not in config: - # Still using old logging, let's add our custom log handler - if "log_handlers_dirs" not in config: - config["log_handlers_dirs"] = [] - config["log_handlers_dirs"].insert( - 0, str(FactoriesManager.get_salt_log_handlers_path()) - ) pytest_key = "pytest-{}".format(role) if pytest_key not in config: