Tests are successful

saltstack · Aug 26, 2024 · 8ae4426 · 8ae4426
1 parent 3efe737
commit 8ae4426
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 26 deletions.
diff --git a/soluble/conf.py b/soluble/conf.py
@@ -24,6 +24,10 @@
         "default": all_opts["config_dir"].default + "/minion",
         "help": "Path to the minion configuration template. Defaults to '/etc/salt/minion' or the master's default minion config",
     },
+    "salt_config_dir": {
+        "default": all_opts["config_dir"].default,
+        "help": all_opts["config_dir"].help.replace("%", ""),
+    },
     "node_prefix": {
         "default": "ephemeral-node-",
         "help": "A prefix to add to the ephemeral minion id",
@@ -71,10 +75,7 @@
         "subcommands": ["minion"],
         "help": "The salt command to run on the ephemeral nodes",
     },
-    "salt_config_dir": {
-        "default": all_opts["config_dir"].default,
-        "help": all_opts["config_dir"].help.replace("%", ""),
-    },
+    "salt_config_dir": {},
     "salt_options": {
         "positional": True,
         "display_priority": 3,

diff --git a/soluble/soluble/init.py b/soluble/soluble/init.py
@@ -1,3 +1,6 @@
+from soluble.conf import CLI_CONFIG
+
+
 def __init__(hub):
     hub.soluble.RUN = {}
     hub.pop.sub.add(dyne_name="lib")
@@ -30,7 +33,7 @@ def cli(hub):
     salt_ssh_opts = []
 
     # Turn salt-ssh opts into a string
-    for name, opts in hub._dynamic["soluble"]["CLI_CONFIG"].items():
+    for name, opts in CLI_CONFIG.items():
         if opts.get("group", "").lower() != "salt-ssh":
             continue
 

diff --git a/tests/integration/conftest.py → tests/conftest.py b/tests/integration/conftest.py → tests/conftest.py
diff --git a/tests/integration/soluble/__init__.py b/tests/integration/soluble/__init__.py
diff --git a/tests/integration/__init__.py → tests/soluble/__init__.py b/tests/integration/__init__.py → tests/soluble/__init__.py
diff --git a/tests/integration/soluble/test_init.py → tests/soluble/test_init.py b/tests/integration/soluble/test_init.py → tests/soluble/test_init.py
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
diff --git a/tests/unit/soluble/__init__.py b/tests/unit/soluble/__init__.py
diff --git a/tests/unit/soluble/test_init.py b/tests/unit/soluble/test_init.py