Merge pull request #56658 from cmcmarrow/mine_value_fix

Mine value fix
saltstack · Apr 23, 2020 · 92327ac · 92327ac
2 parents 5b45fd0 + 798ccf3
commit 92327ac
Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/salt/modules/mine.py b/salt/modules/mine.py
@@ -571,7 +571,7 @@ def valid():
         if function_name:
             mine_data[function_alias] = {
                 function_name: function_args
-                + [{key, value} for key, value in six.iteritems(function_kwargs)]
+                + [{key: value} for key, value in six.iteritems(function_kwargs)]
             }
         else:
             mine_data[function_alias] = function_data

diff --git a/tests/unit/modules/test_mine.py b/tests/unit/modules/test_mine.py
@@ -441,7 +441,11 @@ def test_valid(self):
         """
         config_mine_functions = {
             "network.ip_addrs": [],
-            "kernel": [{"mine_function": "grains.get"}, "kernel"],
+            "kernel": [
+                {"mine_function": "grains.get"},
+                "kernel",
+                {"os": "win32", "v": "2018"},
+            ],
             "fubar": [{"mine_function": "does.not_exist"}],
         }
         with patch.dict(
@@ -452,9 +456,16 @@ def test_valid(self):
                 "grains.get": lambda: True,
             },
         ):
+            ret = mine.valid()
+            # list cant be made to set "dict can't be hashed" and order changes
+            self.assertIsInstance(ret["kernel"]["grains.get"], list)
+            self.assertEqual(len(ret["kernel"]["grains.get"]), 3)
+            for item in ("kernel", {"os": "win32"}, {"v": "2018"}):
+                self.assertTrue(item in ret["kernel"]["grains.get"])
+            ret["kernel"]["grains.get"] = None
+
             self.assertEqual(
-                mine.valid(),
-                {"network.ip_addrs": [], "kernel": {"grains.get": ["kernel"]}},
+                ret, {"network.ip_addrs": [], "kernel": {"grains.get": None}}
             )
 
     def test_get_docker(self):