From 0a9fab159c8d34bfc610f2506a5e3eda8943e539 Mon Sep 17 00:00:00 2001 From: jctanner Date: Mon, 31 Jul 2023 13:44:38 -0400 Subject: [PATCH] Include dev/oci_env_integration in tdd checks. (#1821) * Include dev/oci_env_integration in tdd checks. * Lint fixes. No-Issue Signed-off-by: James Tanner --- dev/common/tdd.py | 3 ++- galaxy_ng/app/access_control/access_policy.py | 6 +++--- galaxy_ng/app/api/ui/views/index_execution_environments.py | 2 +- galaxy_ng/tests/integration/api/test_sync_stage.py | 7 +++++-- galaxy_ng/tests/integration/api/test_v3_plugin_paths.py | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dev/common/tdd.py b/dev/common/tdd.py index 2a5ddf2e93..89b6baa778 100644 --- a/dev/common/tdd.py +++ b/dev/common/tdd.py @@ -55,7 +55,8 @@ def verify_test_files_changed(changed_files): # places where test code goes test_paths = [ - 'galaxy_ng/tests' + 'galaxy_ng/tests', + 'dev/oci_env_integration', ] def is_app_path(fn): diff --git a/galaxy_ng/app/access_control/access_policy.py b/galaxy_ng/app/access_control/access_policy.py index 7d1e92396a..3bbc847959 100644 --- a/galaxy_ng/app/access_control/access_policy.py +++ b/galaxy_ng/app/access_control/access_policy.py @@ -688,14 +688,14 @@ def has_namespace_obj_perms(self, request, view, action, permission): if request.user.has_perm(permission): return True obj = view.get_object() - if type(obj) == container_models.ContainerDistribution: + if type(obj) is container_models.ContainerDistribution: namespace = obj.namespace return request.user.has_perm(permission, namespace) - elif type(obj) == container_models.ContainerPushRepository: + elif type(obj) is container_models.ContainerPushRepository: for dist in obj.distributions.all(): if request.user.has_perm(permission, dist.cast().namespace): return True - elif type(obj) == container_models.ContainerPushRepositoryVersion: + elif type(obj) is container_models.ContainerPushRepositoryVersion: for dist in obj.repository.distributions.all(): if request.user.has_perm(permission, dist.cast().namespace): return True diff --git a/galaxy_ng/app/api/ui/views/index_execution_environments.py b/galaxy_ng/app/api/ui/views/index_execution_environments.py index 16c6a2b1af..893ae61964 100644 --- a/galaxy_ng/app/api/ui/views/index_execution_environments.py +++ b/galaxy_ng/app/api/ui/views/index_execution_environments.py @@ -39,7 +39,7 @@ def post(self, request: Request, *args, **kwargs) -> Response: serializable_meta = {} for key in self.request.META: val = self.request.META[key] - if type(val) == str: + if type(val) is str: serializable_meta[key] = val request_data = { diff --git a/galaxy_ng/tests/integration/api/test_sync_stage.py b/galaxy_ng/tests/integration/api/test_sync_stage.py index 083e2bb03d..876e212c0b 100644 --- a/galaxy_ng/tests/integration/api/test_sync_stage.py +++ b/galaxy_ng/tests/integration/api/test_sync_stage.py @@ -7,8 +7,11 @@ from ..conftest import get_galaxy_client, get_ansible_config, get_hub_version from ..utils import wait_for_task, get_client, set_certification from orionutils.generator import build_collection -from ..utils.iqe_utils import is_sync_testing, get_all_collections,\ - retrieve_collection +from ..utils.iqe_utils import ( + is_sync_testing, + get_all_collections, + retrieve_collection, +) from ..utils.tools import generate_random_artifact_version, uuid4 pytestmark = pytest.mark.qa # noqa: F821 diff --git a/galaxy_ng/tests/integration/api/test_v3_plugin_paths.py b/galaxy_ng/tests/integration/api/test_v3_plugin_paths.py index 094cd60b5d..306adbab42 100644 --- a/galaxy_ng/tests/integration/api/test_v3_plugin_paths.py +++ b/galaxy_ng/tests/integration/api/test_v3_plugin_paths.py @@ -192,7 +192,7 @@ def test_api_v3_plugin_execution_environments_repositories(ansible_config, local assert ns_name == ns_detail_resp['name'] # assert pulp_labels dictionary is in response - assert type(repository_resp['pulp']['repository']['pulp_labels']) == dict + assert type(repository_resp['pulp']['repository']['pulp_labels']) is dict # delete the repository delete_repository_resp = api_client(