From 9b16392648711ad42ced286aae7b6c5c2f4a29b4 Mon Sep 17 00:00:00 2001 From: Alexei Znamensky <103110+russoz@users.noreply.github.com> Date: Mon, 20 Nov 2023 23:23:16 +1300 Subject: [PATCH] test helper: Helper.from_module() injects test function into test module (#7560) --- tests/unit/plugins/modules/helper.py | 7 +++++-- tests/unit/plugins/modules/test_cpanm.py | 4 +--- tests/unit/plugins/modules/test_facter_facts.py | 4 +--- tests/unit/plugins/modules/test_gconftool2.py | 4 +--- tests/unit/plugins/modules/test_gconftool2_info.py | 4 +--- tests/unit/plugins/modules/test_gio_mime.py | 4 +--- tests/unit/plugins/modules/test_opkg.py | 4 +--- tests/unit/plugins/modules/test_puppet.py | 4 +--- tests/unit/plugins/modules/test_xfconf.py | 4 +--- tests/unit/plugins/modules/test_xfconf_info.py | 4 +--- 10 files changed, 14 insertions(+), 29 deletions(-) diff --git a/tests/unit/plugins/modules/helper.py b/tests/unit/plugins/modules/helper.py index 18991cc30e..a7322bf4d8 100644 --- a/tests/unit/plugins/modules/helper.py +++ b/tests/unit/plugins/modules/helper.py @@ -6,6 +6,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +import sys import json from collections import namedtuple from itertools import chain, repeat @@ -108,11 +109,13 @@ class Helper(object): return helper @staticmethod - def from_module(module): + def from_module(module, test_module_name): basename = module.__name__.split(".")[-1] test_spec = "tests/unit/plugins/modules/test_{0}.yaml".format(basename) helper = Helper.from_file(module.main, test_spec) - return helper + + setattr(sys.modules[test_module_name], "patch_bin", helper.cmd_fixture) + setattr(sys.modules[test_module_name], "test_module", helper.test_module) def __init__(self, module_main, test_cases): self.module_main = module_main diff --git a/tests/unit/plugins/modules/test_cpanm.py b/tests/unit/plugins/modules/test_cpanm.py index 3102f7682f..4eecf000fd 100644 --- a/tests/unit/plugins/modules/test_cpanm.py +++ b/tests/unit/plugins/modules/test_cpanm.py @@ -17,6 +17,4 @@ from ansible_collections.community.general.plugins.modules import cpanm from .helper import Helper -helper = Helper.from_module(cpanm) -patch_bin = helper.cmd_fixture -test_module = helper.test_module +Helper.from_module(cpanm, __name__) diff --git a/tests/unit/plugins/modules/test_facter_facts.py b/tests/unit/plugins/modules/test_facter_facts.py index 8afb887e11..227d8cd150 100644 --- a/tests/unit/plugins/modules/test_facter_facts.py +++ b/tests/unit/plugins/modules/test_facter_facts.py @@ -11,6 +11,4 @@ from ansible_collections.community.general.plugins.modules import facter_facts from .helper import Helper -helper = Helper.from_module(facter_facts) -patch_bin = helper.cmd_fixture -test_module = helper.test_module +Helper.from_module(facter_facts, __name__) diff --git a/tests/unit/plugins/modules/test_gconftool2.py b/tests/unit/plugins/modules/test_gconftool2.py index 5ba95c0e22..9608016e58 100644 --- a/tests/unit/plugins/modules/test_gconftool2.py +++ b/tests/unit/plugins/modules/test_gconftool2.py @@ -11,6 +11,4 @@ from ansible_collections.community.general.plugins.modules import gconftool2 from .helper import Helper -helper = Helper.from_module(gconftool2) -patch_bin = helper.cmd_fixture -test_module = helper.test_module +Helper.from_module(gconftool2, __name__) diff --git a/tests/unit/plugins/modules/test_gconftool2_info.py b/tests/unit/plugins/modules/test_gconftool2_info.py index 9e79ee8bad..54676a12d2 100644 --- a/tests/unit/plugins/modules/test_gconftool2_info.py +++ b/tests/unit/plugins/modules/test_gconftool2_info.py @@ -11,6 +11,4 @@ from ansible_collections.community.general.plugins.modules import gconftool2_inf from .helper import Helper -helper = Helper.from_module(gconftool2_info) -patch_bin = helper.cmd_fixture -test_module = helper.test_module +Helper.from_module(gconftool2_info, __name__) diff --git a/tests/unit/plugins/modules/test_gio_mime.py b/tests/unit/plugins/modules/test_gio_mime.py index c81e540df4..f2402ac352 100644 --- a/tests/unit/plugins/modules/test_gio_mime.py +++ b/tests/unit/plugins/modules/test_gio_mime.py @@ -11,6 +11,4 @@ from ansible_collections.community.general.plugins.modules import gio_mime from .helper import Helper -helper = Helper.from_module(gio_mime) -patch_bin = helper.cmd_fixture -test_module = helper.test_module +Helper.from_module(gio_mime, __name__) diff --git a/tests/unit/plugins/modules/test_opkg.py b/tests/unit/plugins/modules/test_opkg.py index ecdb6fdc35..c42025959e 100644 --- a/tests/unit/plugins/modules/test_opkg.py +++ b/tests/unit/plugins/modules/test_opkg.py @@ -11,6 +11,4 @@ from ansible_collections.community.general.plugins.modules import opkg from .helper import Helper -helper = Helper.from_module(opkg) -patch_bin = helper.cmd_fixture -test_module = helper.test_module +Helper.from_module(opkg, __name__) diff --git a/tests/unit/plugins/modules/test_puppet.py b/tests/unit/plugins/modules/test_puppet.py index 728b2a31e0..57f88ada1c 100644 --- a/tests/unit/plugins/modules/test_puppet.py +++ b/tests/unit/plugins/modules/test_puppet.py @@ -17,6 +17,4 @@ from ansible_collections.community.general.plugins.modules import puppet from .helper import Helper -helper = Helper.from_module(puppet) -patch_bin = helper.cmd_fixture -test_module = helper.test_module +Helper.from_module(puppet, __name__) diff --git a/tests/unit/plugins/modules/test_xfconf.py b/tests/unit/plugins/modules/test_xfconf.py index 350b411baf..fbc2dae5f2 100644 --- a/tests/unit/plugins/modules/test_xfconf.py +++ b/tests/unit/plugins/modules/test_xfconf.py @@ -17,6 +17,4 @@ from ansible_collections.community.general.plugins.modules import xfconf from .helper import Helper -helper = Helper.from_module(xfconf) -patch_bin = helper.cmd_fixture -test_module = helper.test_module +Helper.from_module(xfconf, __name__) diff --git a/tests/unit/plugins/modules/test_xfconf_info.py b/tests/unit/plugins/modules/test_xfconf_info.py index 42c911c77f..67c63dda09 100644 --- a/tests/unit/plugins/modules/test_xfconf_info.py +++ b/tests/unit/plugins/modules/test_xfconf_info.py @@ -10,6 +10,4 @@ from ansible_collections.community.general.plugins.modules import xfconf_info from .helper import Helper -helper = Helper.from_module(xfconf_info) -patch_bin = helper.cmd_fixture -test_module = helper.test_module +Helper.from_module(xfconf_info, __name__)