internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

multiple module utils: flatten directories (#11974)

Browse Source 
* multiple module utils: flatten directories

* adjust pritunl tests

* adjust lxca and keycloak tests

* adjust botmeta

* rename test files correctly

* and an import fix

* rename pritunl api mod utils test

* fix typo in test filename

* rename references to pritunl api test

* rename keycloak mod utils test
This commit is contained in:
Alexei Znamensky
2026-05-06 17:07:51 +12:00
committed by GitHub
parent fb0541defb
commit 1047f45bec
84 changed files with 116 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_module_utils.py → tests/unit/plugins/module_utils/test__keycloak.py
View File

@@ -6,7 +6,7 @@ from __future__ import annotations
import unittest
from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import is_struct_included
from ansible_collections.community.general.plugins.module_utils._keycloak import is_struct_included
class KeycloakIsStructIncludedTestCase(unittest.TestCase):

10
tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_connect.py → tests/unit/plugins/module_utils/test__keycloak_connect.py
View File

@@ -10,7 +10,7 @@ from urllib.error import HTTPError
import pytest
from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import (
from ansible_collections.community.general.plugins.module_utils._keycloak import (
KeycloakError,
get_token,
)
@@ -70,7 +70,7 @@ def mock_good_connection(mocker):
),
}
return mocker.patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)
@@ -98,7 +98,7 @@ def mock_bad_json_returned(mocker):
"http://keycloak.url/auth/realms/master/protocol/openid-connect/token": create_wrapper('{"access_token":'),
}
return mocker.patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)
@@ -130,7 +130,7 @@ def mock_401_returned(mocker):
),
}
return mocker.patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)
@@ -154,7 +154,7 @@ def mock_json_without_token_returned(mocker):
),
}
return mocker.patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

4
tests/unit/plugins/module_utils/_net_tools/pritunl/test_api.py → tests/unit/plugins/module_utils/test__pritunl_api.py
View File

@@ -10,9 +10,7 @@ from unittest.mock import MagicMock
import pytest
from ansible.module_utils.common.dict_transformations import dict_merge
from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl import (
api,
)
from ansible_collections.community.general.plugins.module_utils import _pritunl_api as api
# Pritunl Mocks

0
tests/unit/plugins/module_utils/test__sclaeway.py → tests/unit/plugins/module_utils/test__scaleway.py
View File

2
tests/unit/plugins/modules/test_bitbucket_access_key.py
View File

@@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
set_module_args,
)
from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper
from ansible_collections.community.general.plugins.modules import bitbucket_access_key

2
tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py
View File

@@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
set_module_args,
)
from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper
from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_key_pair

2
tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py
View File

@@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
set_module_args,
)
from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper
from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_known_host
from ansible_collections.community.general.plugins.modules.bitbucket_pipeline_known_host import HAS_PARAMIKO

2
tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py
View File

@@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
set_module_args,
)
from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper
from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_variable

2
tests/unit/plugins/modules/test_keycloak_authentication.py
View File

@@ -102,7 +102,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py
View File

@@ -98,7 +98,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_client.py
View File

@@ -90,7 +90,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_client_rolemapping.py
View File

@@ -119,7 +119,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_clientscope.py
View File

@@ -124,7 +124,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_component.py
View File

@@ -69,7 +69,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_identity_provider.py
View File

@@ -122,7 +122,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_realm.py
View File

@@ -81,7 +81,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_realm_info.py
View File

@@ -78,7 +78,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_realm_keys.py
View File

@@ -78,7 +78,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py
View File

@@ -78,7 +78,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_realm_localization.py
View File

@@ -72,7 +72,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_role.py
View File

@@ -119,7 +119,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_user.py
View File

@@ -91,7 +91,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_user_execute_actions_email.py
View File

@@ -46,7 +46,7 @@ def _mock_good_connection():
)
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=_build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_user_federation.py
View File

@@ -78,7 +78,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

2
tests/unit/plugins/modules/test_keycloak_userprofile.py
View File

@@ -79,7 +79,7 @@ def mock_good_connection():
),
}
return patch(
"ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
"ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
side_effect=build_mocked_request(count(), token_response),
autospec=True,
)

8
tests/unit/plugins/modules/test_lxca_cmms.py
View File

@@ -14,7 +14,7 @@ from ansible_collections.community.general.plugins.modules import lxca_cmms
@pytest.fixture(scope="module")
@mock.patch(
"ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.close_conn",
"ansible_collections.community.general.plugins.module_utils._lxca_common.close_conn",
autospec=True,
)
def setup_module(close_conn):
@@ -43,7 +43,7 @@ class TestMyModule:
)
@pytest.mark.usefixtures("patch_ansible_module")
@mock.patch(
"ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
"ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
autospec=True,
)
@mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms.execute_module", autospec=True)
@@ -59,7 +59,7 @@ class TestMyModule:
assert "missing required arguments" in results["msg"]
@mock.patch(
"ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
"ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
autospec=True,
)
@mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms.execute_module", autospec=True)
@@ -87,7 +87,7 @@ class TestMyModule:
assert mock.call(argument_spec=expected_arguments_spec, supports_check_mode=False) == ansible_mod_cls.call_args
@mock.patch(
"ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
"ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
autospec=True,
)
@mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms._cmms_by_uuid", autospec=True)

8
tests/unit/plugins/modules/test_lxca_nodes.py
View File

@@ -14,7 +14,7 @@ from ansible_collections.community.general.plugins.modules import lxca_nodes
@pytest.fixture(scope="module")
@mock.patch(
"ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.close_conn",
"ansible_collections.community.general.plugins.module_utils._lxca_common.close_conn",
autospec=True,
)
def setup_module(close_conn):
@@ -43,7 +43,7 @@ class TestMyModule:
)
@pytest.mark.usefixtures("patch_ansible_module")
@mock.patch(
"ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
"ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
autospec=True,
)
@mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes.execute_module", autospec=True)
@@ -59,7 +59,7 @@ class TestMyModule:
assert "missing required arguments" in results["msg"]
@mock.patch(
"ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
"ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
autospec=True,
)
@mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes.execute_module", autospec=True)
@@ -96,7 +96,7 @@ class TestMyModule:
assert mock.call(argument_spec=expected_arguments_spec, supports_check_mode=False) == ansible_mod_cls.call_args
@mock.patch(
"ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
"ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
autospec=True,
)
@mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes._nodes_by_uuid", autospec=True)

8
tests/unit/plugins/modules/test_pritunl_org.py
View File

@@ -17,7 +17,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
from ansible_collections.community.general.plugins.modules import (
pritunl_org,
)
from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import (
from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import (
PritunlDeleteOrganizationMock,
PritunlListOrganizationAfterPostMock,
PritunlListOrganizationMock,
@@ -35,21 +35,21 @@ class TestPritunlOrg(ModuleTestCase):
def patch_add_pritunl_organization(self, **kwds):
return patch(
"ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._post_pritunl_organization",
"ansible_collections.community.general.plugins.module_utils._pritunl_api._post_pritunl_organization",
autospec=True,
**kwds,
)
def patch_delete_pritunl_organization(self, **kwds):
return patch(
"ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._delete_pritunl_organization",
"ansible_collections.community.general.plugins.module_utils._pritunl_api._delete_pritunl_organization",
autospec=True,
**kwds,
)
def patch_get_pritunl_organizations(self, **kwds):
return patch(
"ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations",
"ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations",
autospec=True,
**kwds,
)

4
tests/unit/plugins/modules/test_pritunl_org_info.py
View File

@@ -16,7 +16,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
from ansible_collections.community.general.plugins.modules import (
pritunl_org_info,
)
from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import (
from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import (
PritunlEmptyOrganizationMock,
PritunlListOrganizationMock,
)
@@ -32,7 +32,7 @@ class TestPritunlOrgInfo(ModuleTestCase):
def patch_get_pritunl_organizations(self, **kwds):
return patch(
"ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations",
"ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations",
autospec=True,
**kwds,
)

12
tests/unit/plugins/modules/test_pritunl_user.py
View File

@@ -17,7 +17,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
from ansible_collections.community.general.plugins.modules import (
pritunl_user,
)
from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import (
from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import (
PritunlDeleteUserMock,
PritunlListOrganizationMock,
PritunlListUserMock,
@@ -47,35 +47,35 @@ class TestPritunlUser(ModuleTestCase):
def patch_get_pritunl_users(self, **kwds):
return patch(
"ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_users",
"ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_users",
autospec=True,
**kwds,
)
def patch_add_pritunl_users(self, **kwds):
return patch(
"ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._post_pritunl_user",
"ansible_collections.community.general.plugins.module_utils._pritunl_api._post_pritunl_user",
autospec=True,
**kwds,
)
def patch_update_pritunl_users(self, **kwds):
return patch(
"ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._put_pritunl_user",
"ansible_collections.community.general.plugins.module_utils._pritunl_api._put_pritunl_user",
autospec=True,
**kwds,
)
def patch_delete_pritunl_users(self, **kwds):
return patch(
"ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._delete_pritunl_user",
"ansible_collections.community.general.plugins.module_utils._pritunl_api._delete_pritunl_user",
autospec=True,
**kwds,
)
def patch_get_pritunl_organizations(self, **kwds):
return patch(
"ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations",
"ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations",
autospec=True,
**kwds,
)

6
tests/unit/plugins/modules/test_pritunl_user_info.py
View File

@@ -16,7 +16,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
from ansible_collections.community.general.plugins.modules import (
pritunl_user_info,
)
from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import (
from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import (
PritunlListOrganizationMock,
PritunlListUserMock,
)
@@ -32,14 +32,14 @@ class TestPritunlUserInfo(ModuleTestCase):
def patch_get_pritunl_users(self, **kwds):
return patch(
"ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_users",
"ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_users",
autospec=True,
**kwds,
)
def patch_get_pritunl_organizations(self, **kwds):
return patch(
"ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations",
"ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations",
autospec=True,
**kwds,
)

2
tests/unit/plugins/modules/test_ss_3par_cpg.py
View File

@@ -11,7 +11,7 @@ sys.modules["hpe3par_sdk"] = mock.Mock()
sys.modules["hpe3par_sdk.client"] = mock.Mock()
sys.modules["hpe3parclient"] = mock.Mock()
sys.modules["hpe3parclient.exceptions"] = mock.Mock()
from ansible_collections.community.general.plugins.module_utils._storage.hpe3par import hpe3par
from ansible_collections.community.general.plugins.module_utils import _hpe3par as hpe3par
from ansible_collections.community.general.plugins.modules import ss_3par_cpg