Prepare un-flatmapping (#5350)

* Add module name into fixtures directory name.

* Rename conftest.py to avoid collisions.

* Match filenames inside directories.

tests/unit/plugins/modules/cloud/linode/test_linode.py

@@ -10,6 +10,8 @@ import pytest
 from ansible_collections.community.general.plugins.modules.cloud.linode import linode
 from ansible_collections.community.general.tests.unit.plugins.modules.utils import set_module_args
 
+from .linode_conftest import api_key, auth
+
 if not linode.HAS_LINODE:
     pytestmark = pytest.mark.skip('test_linode.py requires the `linode-python` module')
 

tests/unit/plugins/modules/cloud/linode/test_linode_v4.py

@@ -25,6 +25,8 @@ from ansible_collections.community.general.plugins.module_utils.linode import ge
 from ansible_collections.community.general.tests.unit.plugins.modules.utils import set_module_args
 from ansible_collections.community.general.tests.unit.compat import mock
 
+from .linode_conftest import access_token, no_access_token_in_env, default_args, mock_linode
+
 
 def test_mandatory_state_is_validated(capfd):
     with pytest.raises(SystemExit):

tests/unit/plugins/modules/cloud/xenserver/test_xenserver_guest_info.py

@@ -11,7 +11,8 @@ __metaclass__ = type
 import json
 import pytest
 
-from .common import fake_xenapi_ref
+from .xenserver_common import fake_xenapi_ref
+from .xenserver_conftest import XenAPI, xenserver_guest_info
 
 pytestmark = pytest.mark.usefixtures('patch_ansible_module')
 

tests/unit/plugins/modules/cloud/xenserver/test_xenserver_guest_powerstate.py

@@ -10,7 +10,8 @@ __metaclass__ = type
 import json
 import pytest
 
-from .common import fake_xenapi_ref
+from .xenserver_common import fake_xenapi_ref
+from .xenserver_conftest import fake_ansible_module, XenAPI, xenserver_guest_powerstate
 
 
 testcase_set_powerstate = {

tests/unit/plugins/modules/packaging/os/test_rhn_channel.py

@@ -10,6 +10,8 @@ import json
 
 from ansible_collections.community.general.plugins.modules.packaging.os import rhn_channel
 
+from .rhn_conftest import mock_request
+
 import pytest
 
 

tests/unit/plugins/modules/packaging/os/test_rhn_register.py

@@ -15,6 +15,8 @@ import ansible.module_utils.six
 from ansible.module_utils.six.moves import xmlrpc_client
 from ansible_collections.community.general.plugins.modules.packaging.os import rhn_register
 
+from .rhn_conftest import mock_request
+
 import pytest
 
 

tests/unit/plugins/modules/remote_management/oneview/hpe_test_utils.py

@@ -13,6 +13,7 @@ import yaml
 
 from mock import Mock, patch
 from .oneview_module_loader import ONEVIEW_MODULE_UTILS_PATH
+from .oneview_conftest import mock_ov_client, mock_ansible_module
 from hpOneView.oneview_client import OneViewClient
 
 

tests/unit/plugins/modules/remote_management/oneview/oneview_module_loader.py

@@ -10,8 +10,9 @@ from ansible_collections.community.general.tests.unit.compat.mock import Mock
 
 # FIXME: These should be done inside of a fixture so that they're only mocked during
 # these unittests
-sys.modules['hpOneView'] = Mock()
-sys.modules['hpOneView.oneview_client'] = Mock()
+if 'hpOneView' not in sys.modules:
+    sys.modules['hpOneView'] = Mock()
+    sys.modules['hpOneView.oneview_client'] = Mock()
 
 ONEVIEW_MODULE_UTILS_PATH = 'ansible_collections.community.general.plugins.module_utils.oneview'
 from ansible_collections.community.general.plugins.module_utils.oneview import (OneViewModuleException,

tests/unit/plugins/modules/remote_management/oneview/test_oneview_datacenter_info.py

@@ -7,8 +7,10 @@ __metaclass__ = type
 
 import pytest
 
-from ansible_collections.community.general.plugins.modules.remote_management.oneview.oneview_datacenter_info import DatacenterInfoModule
 from .hpe_test_utils import FactsParamsTest
+from .oneview_conftest import mock_ov_client, mock_ansible_module
+
+from ansible_collections.community.general.plugins.modules.remote_management.oneview.oneview_datacenter_info import DatacenterInfoModule
 
 PARAMS_GET_CONNECTED = dict(
     config='config.json',

tests/unit/plugins/modules/remote_management/oneview/test_oneview_enclosure_info.py

@@ -5,9 +5,11 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+from .hpe_test_utils import FactsParamsTestCase
+from .oneview_conftest import mock_ov_client, mock_ansible_module
+
 from ansible_collections.community.general.tests.unit.compat import unittest
 from ansible_collections.community.general.plugins.modules.remote_management.oneview.oneview_enclosure_info import EnclosureInfoModule
-from .hpe_test_utils import FactsParamsTestCase
 
 
 ERROR_MSG = 'Fake message error'

tests/unit/plugins/modules/remote_management/oneview/test_oneview_ethernet_network.py

@@ -11,6 +11,7 @@ import yaml
 
 from ansible_collections.community.general.tests.unit.compat import unittest, mock
 from .oneview_module_loader import EthernetNetworkModule
+from .oneview_conftest import mock_ov_client, mock_ansible_module
 from .hpe_test_utils import OneViewBaseTestCase
 
 FAKE_MSG_ERROR = 'Fake message error'

tests/unit/plugins/modules/remote_management/oneview/test_oneview_ethernet_network_info.py

@@ -8,6 +8,7 @@ __metaclass__ = type
 from ansible_collections.community.general.tests.unit.compat import unittest
 
 from .oneview_module_loader import EthernetNetworkInfoModule
+from .oneview_conftest import mock_ov_client, mock_ansible_module
 from .hpe_test_utils import FactsParamsTestCase
 
 ERROR_MSG = 'Fake message error'

tests/unit/plugins/modules/remote_management/oneview/test_oneview_fc_network.py

@@ -9,6 +9,7 @@ __metaclass__ = type
 
 from ansible_collections.community.general.tests.unit.compat import unittest
 from .oneview_module_loader import FcNetworkModule
+from .oneview_conftest import mock_ov_client, mock_ansible_module
 from .hpe_test_utils import OneViewBaseTestCase
 
 FAKE_MSG_ERROR = 'Fake message error'

tests/unit/plugins/modules/remote_management/oneview/test_oneview_fc_network_info.py

@@ -7,6 +7,7 @@ __metaclass__ = type
 
 from ansible_collections.community.general.tests.unit.compat import unittest
 from .oneview_module_loader import FcNetworkInfoModule
+from .oneview_conftest import mock_ov_client, mock_ansible_module
 from .hpe_test_utils import FactsParamsTestCase
 
 ERROR_MSG = 'Fake message error'

tests/unit/plugins/modules/remote_management/oneview/test_oneview_fcoe_network.py

@@ -9,6 +9,7 @@ __metaclass__ = type
 
 from ansible_collections.community.general.tests.unit.compat import unittest
 from .oneview_module_loader import FcoeNetworkModule
+from .oneview_conftest import mock_ov_client, mock_ansible_module
 from .hpe_test_utils import OneViewBaseTestCase
 
 FAKE_MSG_ERROR = 'Fake message error'

tests/unit/plugins/modules/remote_management/oneview/test_oneview_fcoe_network_info.py

@@ -8,7 +8,7 @@ __metaclass__ = type
 from ansible_collections.community.general.tests.unit.compat import unittest
 
 from .oneview_module_loader import FcoeNetworkInfoModule
-
+from .oneview_conftest import mock_ov_client, mock_ansible_module
 from .hpe_test_utils import FactsParamsTestCase
 
 ERROR_MSG = 'Fake message error'

tests/unit/plugins/modules/remote_management/oneview/test_oneview_logical_interconnect_group.py

@@ -8,8 +8,9 @@ __metaclass__ = type
 from copy import deepcopy
 
 from ansible_collections.community.general.tests.unit.compat import unittest, mock
-from ansible_collections.community.general.plugins.modules.remote_management.oneview.oneview_logical_interconnect_group import LogicalInterconnectGroupModule
 from .hpe_test_utils import OneViewBaseTestCase
+from .oneview_conftest import mock_ov_client, mock_ansible_module
+from ansible_collections.community.general.plugins.modules.remote_management.oneview.oneview_logical_interconnect_group import LogicalInterconnectGroupModule
 
 
 FAKE_MSG_ERROR = 'Fake message error'

tests/unit/plugins/modules/remote_management/oneview/test_oneview_logical_interconnect_group_info.py

@@ -6,10 +6,11 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from ansible_collections.community.general.tests.unit.compat import unittest
+from .hpe_test_utils import FactsParamsTestCase
+from .oneview_conftest import mock_ov_client, mock_ansible_module
 from ansible_collections.community.general.plugins.modules.remote_management.oneview.oneview_logical_interconnect_group_info import (
     LogicalInterconnectGroupInfoModule
 )
-from .hpe_test_utils import FactsParamsTestCase
 
 
 ERROR_MSG = 'Fake message error'

tests/unit/plugins/modules/remote_management/oneview/test_oneview_network_set.py

@@ -8,6 +8,7 @@ __metaclass__ = type
 from ansible_collections.community.general.tests.unit.compat import unittest, mock
 from .hpe_test_utils import OneViewBaseTestCase
 from .oneview_module_loader import NetworkSetModule
+from .oneview_conftest import mock_ov_client, mock_ansible_module
 
 FAKE_MSG_ERROR = 'Fake message error'
 

tests/unit/plugins/modules/remote_management/oneview/test_oneview_network_set_info.py

@@ -7,6 +7,7 @@ __metaclass__ = type
 
 from ansible_collections.community.general.tests.unit.compat import unittest
 from .oneview_module_loader import NetworkSetInfoModule
+from .oneview_conftest import mock_ov_client, mock_ansible_module
 from .hpe_test_utils import FactsParamsTestCase
 
 ERROR_MSG = 'Fake message error'

tests/unit/plugins/modules/remote_management/oneview/test_oneview_san_manager.py

@@ -7,6 +7,7 @@ __metaclass__ = type
 
 from ansible_collections.community.general.tests.unit.compat import unittest, mock
 from .oneview_module_loader import SanManagerModule
+from .oneview_conftest import mock_ov_client, mock_ansible_module
 from .hpe_test_utils import OneViewBaseTestCase
 from copy import deepcopy
 

tests/unit/plugins/modules/remote_management/oneview/test_oneview_san_manager_info.py

@@ -7,6 +7,7 @@ __metaclass__ = type
 
 from ansible_collections.community.general.tests.unit.compat import unittest
 from .oneview_module_loader import SanManagerInfoModule
+from .oneview_conftest import mock_ov_client, mock_ansible_module
 from .hpe_test_utils import FactsParamsTestCase
 
 

tests/unit/plugins/modules/system/interfaces_file/interfaces_file-README.md

@@ -15,7 +15,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 1. Clone project to `ansible_collections/community/general`
 2. Change directory to the project one `cd ansible_collections/community/general`
-3. Run `ansible-test units --docker -v --python 3.6 tests/unit/plugins/modules/system/interfaces_file/test_interfaces_file.py`
+3. Run `ansible-test units --docker -v --python 3.10 tests/unit/plugins/modules/system/interfaces_file/test_interfaces_file.py`
 
 ## Adding tests
 
@@ -23,5 +23,5 @@ SPDX-License-Identifier: GPL-3.0-or-later
 2. New test cases should be defined in `test_interfaces_file.py`. Same for new test functions if needed
 3. On first test run for a new combination of a test case and an interface configuration new set of golden files will be generated. In case of docker-based test approach that's going to fail due to RO mount option. The workaround is to run tests locally with Python 3 (3.7 in this example):
     1. Install required modules with `pip3.7 install pytest-xdist pytest-mock mock`
-    3. Run tests with `ansible-test units --python 3.7 tests/unit/plugins/modules/system/interfaces_file/test_interfaces_file.py`
+    3. Run tests with `ansible-test units --python 3.10 tests/unit/plugins/modules/system/interfaces_file/test_interfaces_file.py`
 4. Carefully verify newly created golden output files!