Merge 5552e13 into eb81cf2

tests/end2end/test_zhmc_partition.py

@@ -25,7 +25,7 @@
 from zhmcclient.testutils.hmc_definition_fixtures import hmc_definition, hmc_session  # noqa: F401, E501
 
 from zhmc_ansible_modules import zhmc_partition
-from .utils import mock_ansible_module, get_failure_msg, get_module_output
+from .utils import mock_ansible_module, get_failure_msg
 
 requests.packages.urllib3.disable_warnings()
 
@@ -40,6 +40,25 @@
 )
 
 
+def get_module_output(mod_obj):
+    """
+    Return the module output as a tuple (changed, partition_properties) (i.e.
+    the arguments of the call to exit_json()).
+    If the module failed, return None.
+    """
+
+    def func(changed, partition):
+        return changed, partition
+
+    if not mod_obj.exit_json.called:
+        return None
+    call_args = mod_obj.exit_json.call_args
+
+    # The following makes sure we get the arguments regardless of whether they
+    # were specified as positional or keyword arguments:
+    return func(*call_args[0], **call_args[1])
+
+
 def assert_partition_props(partition_props):
     """
     Assert the output object of the zhmc_partition module

tests/end2end/utils.py

@@ -47,22 +47,3 @@ def func(msg):
     # The following makes sure we get the arguments regardless of whether they
     # were specified as positional or keyword arguments:
     return func(*call_args[0], **call_args[1])
-
-
-def get_module_output(mod_obj):
-    """
-    Return the module output as a tuple (changed, partition_properties) (i.e.
-    the arguments of the call to exit_json()).
-    If the module failed, return None.
-    """
-
-    def func(changed, partition):
-        return changed, partition
-
-    if not mod_obj.exit_json.called:
-        return None
-    call_args = mod_obj.exit_json.call_args
-
-    # The following makes sure we get the arguments regardless of whether they
-    # were specified as positional or keyword arguments:
-    return func(*call_args[0], **call_args[1])