Rename some test functions.

No-Issue

Signed-off-by: James Tanner <[email protected]>

galaxy_ng/tests/integration/api/test_aiindex.py

@@ -3,7 +3,7 @@
 from ..utils import (
     UIClient,
     SocialGithubClient,
-    generate_unused_namespace,
+    generate_unused_namespace_name,
     get_client
 )
 
@@ -31,7 +31,7 @@ def pe_namespace(ansible_config) -> str:
     """create a new namespace owned by PE user."""
     config = ansible_config("partner_engineer")
     api_client = get_client(config, request_token=True, require_auth=True)
-    new_namespace = generate_unused_namespace(api_client=api_client, api_version="_ui/v1")
+    new_namespace = generate_unused_namespace_name(api_client=api_client, api_version="_ui/v1")
     with UIClient(config=config) as uclient:
         # get user
         resp = uclient.get("_ui/v1/me/")

galaxy_ng/tests/integration/api/test_ui_paths.py

@@ -32,7 +32,7 @@
 )
 from ..utils import (
     UIClient,
-    generate_unused_namespace,
+    generate_unused_namespace_name,
     get_client,
     wait_for_task_ui_client,
     wait_for_task,
@@ -574,7 +574,7 @@ def test_api_ui_v1_me(ansible_config, settings):
 def test_api_ui_v1_my_namespaces(ansible_config):
     config = ansible_config("partner_engineer")
     api_client = get_client(config, request_token=True, require_auth=True)
-    new_namespace = generate_unused_namespace(api_client=api_client, api_version='_ui/v1')
+    new_namespace = generate_unused_namespace_name(api_client=api_client, api_version='_ui/v1')
 
     cfg = ansible_config('partner_engineer')
     with UIClient(config=cfg) as uclient:

galaxy_ng/tests/integration/community/test_v1_namespaces.py

@@ -7,7 +7,7 @@
     ansible_galaxy,
     SocialGithubClient,
     get_client,
-    generate_unused_namespace,
+    generate_unused_namespace_name,
 )
 
 from ..utils.legacy import cleanup_social_user
@@ -96,12 +96,12 @@ def test_v1_namespace_provider_filter(ansible_config):
     v1_b_id = v1_b['id']
 
     # make 1 v3 namespace
-    v3_a_name = generate_unused_namespace(admin_client)
+    v3_a_name = generate_unused_namespace_name(admin_client)
     v3_a = admin_client(
         '/api/v3/namespaces/', method='POST', args={'name': v3_a_name, 'groups': []}
     )
     v3_a_id = v3_a['id']
-    v3_b_name = generate_unused_namespace(admin_client)
+    v3_b_name = generate_unused_namespace_name(admin_client)
     v3_b = admin_client(
         '/api/v3/namespaces/', method='POST', args={'name': v3_b_name, 'groups': []}
     )

galaxy_ng/tests/integration/utils/__init__.py

@@ -22,9 +22,9 @@
     CapturingGalaxyError,
 )
 from .namespaces import (
-    generate_namespace,
+    generate_namespace_name,
     get_all_namespaces,
-    generate_unused_namespace,
+    generate_unused_namespace_name,
     create_unused_namespace,
     cleanup_namespace
 )
@@ -68,9 +68,9 @@
     get_all_repository_collection_versions,
     TaskWaitingTimeout,
     CapturingGalaxyError,
-    generate_namespace,
+    generate_namespace_name,
     get_all_namespaces,
-    generate_unused_namespace,
+    generate_unused_namespace_name,
     create_unused_namespace,
     cleanup_namespace,
     wait_for_task,

galaxy_ng/tests/integration/utils/namespaces.py

@@ -10,7 +10,7 @@
 logger = logging.getLogger(__name__)
 
 
-def generate_namespace(exclude=None):
+def generate_namespace_name(exclude=None):
     """ Create a valid random namespace string """
 
     # This should be a list of pre-existing namespaces
@@ -58,13 +58,13 @@ def get_all_namespaces(api_client=None, api_version='v3'):
     return namespaces
 
 
-def generate_unused_namespace(api_client=None, api_version='v3'):
+def generate_unused_namespace_name(api_client=None, api_version='v3'):
     """ Make a random namespace string that does not exist """
 
     assert api_client is not None, "api_client is a required param"
     existing = get_all_namespaces(api_client=api_client, api_version=api_version)
     existing = dict((x['name'], x) for x in existing)
-    return generate_namespace(exclude=list(existing.keys()))
+    return generate_namespace_name(exclude=list(existing.keys()))
 
 
 def create_unused_namespace(api_client=None):
@@ -73,7 +73,7 @@ def create_unused_namespace(api_client=None):
     assert api_client is not None, "api_client is a required param"
     api_prefix = api_client.config.get("api_prefix").rstrip("/")
 
-    ns = generate_unused_namespace(api_client=api_client)
+    ns = generate_unused_namespace_name(api_client=api_client)
     payload = {'name': ns, 'groups': []}
     api_client(f'{api_prefix}/v3/namespaces/', args=payload, method='POST')
     return ns