Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove pulp-smash from test_pull_content #1921

Merged
merged 1 commit into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pulp_container/app/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,15 @@ class BlobSerializer(SingleArtifactContentSerializer):

digest = serializers.CharField(help_text="sha256 of the Blob file")

def __init__(self, *args, **kwargs):
"""Fix for bindings to allow for on-demand blobs."""
# TODO: Move into pulpcore
# This is a fix for the bindings to allow for serializing on-demand blobs.
# There is no create API for blobs, so this doesn't affect the API.
super().__init__(*args, **kwargs)
if "artifact" in self.fields:
self.fields["artifact"].allow_null = True

class Meta:
fields = SingleArtifactContentSerializer.Meta.fields + ("digest",)
model = models.Blob
Expand Down
2 changes: 1 addition & 1 deletion pulp_container/tests/functional/api/test_content_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def fetch_response_metadata(response):
return response.status_code, response.headers.get("X-PULP-CACHE")


@pytest.mark.parallel
# @pytest.mark.parallel # Some other parallel test is causing this fail periodically
def test_content_cache(
container_bindings,
container_repository_factory,
Expand Down
Loading
Loading