Prepare un-flatmapping (#5350) (#5427)

* Add module name into fixtures directory name.

* Rename conftest.py to avoid collisions.

* Match filenames inside directories.

(cherry picked from commit fa924aae31)

Co-authored-by: Felix Fontein <felix@fontein.de>

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