[PR #7181/d6ebba1a backport][stable-6] cmd tests improvement (#7186)

cmd tests improvement (#7181)

* cmd tests improvement

* fix sanity

* remove commented line

* fixed class init code

(cherry picked from commit d6ebba1aea)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>

tests/unit/plugins/modules/cmd_runner_test_utils.py

@@ -6,7 +6,6 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-import os
 from collections import namedtuple
 from itertools import chain, repeat
 
@@ -19,16 +18,20 @@ RunCmdCall = namedtuple("RunCmdCall", ["command", "environ", "rc", "out", "err"]
 
 
 class CmdRunnerTestHelper(object):
-    def __init__(self, command, test_cases):
-        self.command = command
+    def __init__(self, test_cases):
         self._test_cases = test_cases
-        self.testcases = self._make_test_cases()
+        if isinstance(test_cases, (list, tuple)):
+            self.testcases = test_cases
+        else:
+            self.testcases = self._make_test_cases()
 
     @property
     def cmd_fixture(self):
         @pytest.fixture
         def patch_bin(mocker):
-            mocker.patch('ansible.module_utils.basic.AnsibleModule.get_bin_path', return_value=os.path.join('/testbin', self.command))
+            def mockie(self, path, *args, **kwargs):
+                return "/testbin/{0}".format(path)
+            mocker.patch('ansible.module_utils.basic.AnsibleModule.get_bin_path', mockie)
 
         return patch_bin
 

tests/unit/plugins/modules/test_opkg.py

@@ -16,7 +16,7 @@ from .cmd_runner_test_utils import CmdRunnerTestHelper
 
 TESTED_MODULE = module.__name__
 with open("tests/unit/plugins/modules/test_opkg.yaml", "r") as TEST_CASES:
-    helper = CmdRunnerTestHelper(command="opkg", test_cases=TEST_CASES)
+    helper = CmdRunnerTestHelper(test_cases=TEST_CASES)
     patch_bin = helper.cmd_fixture
 
 

tests/unit/plugins/modules/test_xfconf.py

@@ -22,7 +22,7 @@ from .cmd_runner_test_utils import CmdRunnerTestHelper
 
 TESTED_MODULE = module.__name__
 with open("tests/unit/plugins/modules/test_xfconf.yaml", "r") as TEST_CASES:
-    helper = CmdRunnerTestHelper(command="xfconf-query", test_cases=TEST_CASES)
+    helper = CmdRunnerTestHelper(test_cases=TEST_CASES)
     patch_bin = helper.cmd_fixture
 
 

tests/unit/plugins/modules/test_xfconf_info.py

@@ -15,7 +15,7 @@ from .cmd_runner_test_utils import CmdRunnerTestHelper
 
 TESTED_MODULE = module.__name__
 with open("tests/unit/plugins/modules/test_xfconf_info.yaml", "r") as TEST_CASES:
-    helper = CmdRunnerTestHelper(command="xfconf-query", test_cases=TEST_CASES)
+    helper = CmdRunnerTestHelper(test_cases=TEST_CASES)
     patch_bin = helper.cmd_fixture