Skip to content

Commit

Permalink
fixup: use fixture settings
Browse files Browse the repository at this point in the history
  • Loading branch information
pedro-psb committed Dec 11, 2024
1 parent b755d0c commit cf07383
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 18 deletions.
5 changes: 2 additions & 3 deletions pulpcore/tests/functional/api/test_artifact_distribution.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
import subprocess
from hashlib import sha256

from django.conf import settings


OBJECT_STORAGES = (
"storages.backends.s3boto3.S3Boto3Storage",
Expand All @@ -12,7 +10,8 @@
)


def test_artifact_distribution(random_artifact):
def test_artifact_distribution(random_artifact, pulp_settings):
settings = pulp_settings
artifact_uuid = random_artifact.pulp_href.split("/")[-2]

commands = (
Expand Down
4 changes: 2 additions & 2 deletions pulpcore/tests/functional/api/test_crd_artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import uuid
import pytest

from django.conf import settings
from pulpcore.client.pulpcore import ApiException


Expand Down Expand Up @@ -145,9 +144,10 @@ def test_upload_mixed_attrs(pulpcore_bindings, pulpcore_random_file):


@pytest.mark.parallel
def test_delete_artifact(pulpcore_bindings, pulpcore_random_file, gen_user):
def test_delete_artifact(pulpcore_bindings, pulpcore_random_file, gen_user, pulp_settings):
"""Verify that the deletion of artifacts is prohibited for both regular users and
administrators."""
settings = pulp_settings
if settings.STORAGES["default"]["BACKEND"] != "pulpcore.app.models.storage.FileSystem":
pytest.skip("this test only works for filesystem storage")
media_root = settings.MEDIA_ROOT
Expand Down
14 changes: 9 additions & 5 deletions pulpcore/tests/functional/api/test_crud_domains.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import string
import json
from pulpcore.client.pulpcore import ApiException
from django.conf import settings

from pulpcore.tests.functional.utils import PulpTaskError

Expand Down Expand Up @@ -51,15 +50,16 @@ def test_crud_domains(pulpcore_bindings, monitor_task):


@pytest.mark.parallel
def test_default_domain(pulpcore_bindings):
def test_default_domain(pulpcore_bindings, pulp_settings):
"""Test properties around the default domain."""
settings = pulp_settings
domains = pulpcore_bindings.DomainsApi.list(name="default")
assert domains.count == 1

# Read the default domain, ensure storage is set to default
default_domain = domains.results[0]
assert default_domain.name == "default"
assert default_domain.storage_class == settings.storages.default.backend
assert default_domain.storage_class == settings.STORAGES["default"]["BACKEND"]
assert default_domain.redirect_to_object_storage == settings.REDIRECT_TO_OBJECT_STORAGE
assert default_domain.hide_guarded_distributions == settings.HIDE_GUARDED_DISTRIBUTIONS

Expand Down Expand Up @@ -92,8 +92,9 @@ def test_default_domain(pulpcore_bindings):


@pytest.mark.parallel
def test_active_domain_deletion(pulpcore_bindings, monitor_task):
def test_active_domain_deletion(pulpcore_bindings, monitor_task, pulp_settings):
"""Test trying to delete a domain that is in use, has objects in it."""
settings = pulp_settings
if not settings.DOMAIN_ENABLED:
pytest.skip("Domains not enabled")
name = str(uuid.uuid4())
Expand Down Expand Up @@ -133,8 +134,10 @@ def test_orphan_domain_deletion(
gen_object_with_cleanup,
monitor_task,
tmp_path,
pulp_settings,
):
"""Test trying to delete a domain that is in use, has objects in it."""
settings = pulp_settings
if not settings.DOMAIN_ENABLED:
pytest.skip("Domains not enabled")
body = {
Expand Down Expand Up @@ -177,8 +180,9 @@ def test_orphan_domain_deletion(


@pytest.mark.parallel
def test_special_domain_creation(pulpcore_bindings, gen_object_with_cleanup):
def test_special_domain_creation(pulpcore_bindings, gen_object_with_cleanup, pulp_settings):
"""Test many possible domain creation scenarios."""
settings = pulp_settings
if not settings.DOMAIN_ENABLED:
pytest.skip("Domains not enabled")
# This test needs to account for which environment it is running in
Expand Down
11 changes: 5 additions & 6 deletions pulpcore/tests/functional/api/test_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import pytest

from django.conf import settings
from jsonschema import validate
from pulpcore.client.pulpcore import ApiException

Expand Down Expand Up @@ -59,24 +58,24 @@


@pytest.mark.parallel
def test_get_authenticated(test_path, pulpcore_bindings):
def test_get_authenticated(test_path, pulpcore_bindings, pulp_settings):
"""GET the status path with valid credentials.
Verify the response with :meth:`verify_get_response`.
"""
response = pulpcore_bindings.StatusApi.status_read()
verify_get_response(response.to_dict(), STATUS)
verify_get_response(response.to_dict(), STATUS, pulp_settings)


@pytest.mark.parallel
def test_get_unauthenticated(test_path, pulpcore_bindings, anonymous_user):
def test_get_unauthenticated(test_path, pulpcore_bindings, anonymous_user, pulp_settings):
"""GET the status path with no credentials.
Verify the response with :meth:`verify_get_response`.
"""
with anonymous_user:
response = pulpcore_bindings.StatusApi.status_read()
verify_get_response(response.to_dict(), STATUS)
verify_get_response(response.to_dict(), STATUS, pulp_settings)


@pytest.mark.parallel
Expand Down Expand Up @@ -127,7 +126,7 @@ def test_storage_per_domain(
assert default_status.storage != domain_status.storage


def verify_get_response(status, expected_schema):
def verify_get_response(status, expected_schema, settings):
"""Verify the response to an HTTP GET call.
Verify that several attributes and have the correct type or value.
Expand Down
6 changes: 4 additions & 2 deletions pulpcore/tests/functional/api/using_plugin/test_orphans.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import os
import pytest

from pulpcore.app import settings


def test_content_orphan_filter(
file_bindings,
Expand Down Expand Up @@ -68,7 +66,9 @@ def test_orphans_delete(
random_artifact,
file_random_content_unit,
monitor_task,
pulp_settings,
):
settings = pulp_settings
# Verify that the system contains the orphan content unit and the orphan artifact.
content_unit = file_bindings.ContentFilesApi.read(file_random_content_unit.pulp_href)
artifact = pulpcore_bindings.ArtifactsApi.read(random_artifact.pulp_href)
Expand Down Expand Up @@ -100,7 +100,9 @@ def test_orphans_cleanup(
random_artifact,
file_random_content_unit,
monitor_task,
pulp_settings,
):
settings = pulp_settings
# Cleanup orphans with a nonzero orphan_protection_time
monitor_task(pulpcore_bindings.OrphansCleanupApi.cleanup({"orphan_protection_time": 10}).task)

Expand Down

0 comments on commit cf07383

Please sign in to comment.