Attempt to use subfolders within temporary directory for plugins

ClearcodeHQ · Apr 30, 2022 · 02f65fb · 02f65fb
1 parent ab940ae
commit 02f65fb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/pytest_rabbitmq/factories/executor.py b/src/pytest_rabbitmq/factories/executor.py
@@ -37,7 +37,7 @@ def __init__(
         envvars = {
             "RABBITMQ_LOG_BASE": logpath + f"/rabbit-server.{port}.log",
             "RABBITMQ_MNESIA_BASE": path + "mnesia",
-            "RABBITMQ_ENABLED_PLUGINS_FILE": plugin_path + "/plugins",
+            "RABBITMQ_ENABLED_PLUGINS_FILE": plugin_path + "/enabled",
             "RABBITMQ_PLUGINS_DIR": plugin_path,
             "RABBITMQ_NODE_PORT": str(port),
             # Use the port number in node name, so multiple instances started

diff --git a/src/pytest_rabbitmq/factories/process.py b/src/pytest_rabbitmq/factories/process.py
@@ -96,7 +96,7 @@ def rabbitmq_proc_fixture(request):
         rabbit_port = get_port(port) or get_port(config["port"])
 
         rabbit_path = os.path.join(gettempdir(), f"rabbitmq.{rabbit_port}/")
-        rabbit_plugin_path = plugindir or config["plugindir"] or rabbit_path
+        rabbit_plugin_path = plugindir or config["plugindir"] or os.path.join(rabbit_path, "plugins")
 
         rabbit_executor = RabbitMqExecutor(
             rabbit_server,

diff --git a/src/pytest_rabbitmq/plugin.py b/src/pytest_rabbitmq/plugin.py
@@ -56,8 +56,8 @@ def pytest_addoption(parser):
     )
     parser.addini(
         name="rabbitmq_plugindir",
-        help=_help_logsdir,
-        default=gettempdir(),
+        help=_help_plugindir,
+        default=None,
     )
     parser.addini(
         name="rabbitmq_node",