From f7656ac0d3a82845dd12accc804cbe0a66d8b9c1 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Mon, 12 Oct 2020 11:08:33 +0530 Subject: [PATCH] kubevirt: Re-enable unit tests (#1070) Fixes: #1064 Signed-off-by: Abhijeet Kasurde --- .../unit/plugins/modules/cloud/kubevirt/kubevirt_fixtures.py | 5 +++-- .../{test_kubevirt_rs.py.disabled => test_kubevirt_rs.py} | 0 .../{test_kubevirt_vm.py.disabled => test_kubevirt_vm.py} | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename tests/unit/plugins/modules/cloud/kubevirt/{test_kubevirt_rs.py.disabled => test_kubevirt_rs.py} (100%) rename tests/unit/plugins/modules/cloud/kubevirt/{test_kubevirt_vm.py.disabled => test_kubevirt_vm.py} (100%) diff --git a/tests/unit/plugins/modules/cloud/kubevirt/kubevirt_fixtures.py b/tests/unit/plugins/modules/cloud/kubevirt/kubevirt_fixtures.py index f91bb02679..71fb1dd8eb 100644 --- a/tests/unit/plugins/modules/cloud/kubevirt/kubevirt_fixtures.py +++ b/tests/unit/plugins/modules/cloud/kubevirt/kubevirt_fixtures.py @@ -3,6 +3,7 @@ __metaclass__ = type import pytest +from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.tests.unit.compat.mock import MagicMock from ansible_collections.community.kubernetes.plugins.module_utils.common import K8sAnsibleMixin @@ -52,9 +53,9 @@ def fail_json(*args, **kwargs): @pytest.fixture() def base_fixture(monkeypatch): monkeypatch.setattr( - KubernetesRawModule, "exit_json", exit_json) + AnsibleModule, "exit_json", exit_json) monkeypatch.setattr( - KubernetesRawModule, "fail_json", fail_json) + AnsibleModule, "fail_json", fail_json) # Create mock methods in Resource directly, otherwise dyn client # tries binding those to corresponding methods in DynamicClient # (with partial()), which is more problematic to intercept diff --git a/tests/unit/plugins/modules/cloud/kubevirt/test_kubevirt_rs.py.disabled b/tests/unit/plugins/modules/cloud/kubevirt/test_kubevirt_rs.py similarity index 100% rename from tests/unit/plugins/modules/cloud/kubevirt/test_kubevirt_rs.py.disabled rename to tests/unit/plugins/modules/cloud/kubevirt/test_kubevirt_rs.py diff --git a/tests/unit/plugins/modules/cloud/kubevirt/test_kubevirt_vm.py.disabled b/tests/unit/plugins/modules/cloud/kubevirt/test_kubevirt_vm.py similarity index 100% rename from tests/unit/plugins/modules/cloud/kubevirt/test_kubevirt_vm.py.disabled rename to tests/unit/plugins/modules/cloud/kubevirt/test_kubevirt_vm.py