From 8b4e22f43b3c713d232f7795cb1ad721e7a20687 Mon Sep 17 00:00:00 2001 From: Bruno Rocha Date: Thu, 23 Feb 2023 13:03:55 +0000 Subject: [PATCH] Add export test fixes: #1325 --- .../app/migrations/0048_merge_20230223_1246.py | 14 ++++++++++++++ pulp_ansible/app/viewsets.py | 4 ++-- .../tests/functional/api/test_export_import.py | 11 +++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 pulp_ansible/app/migrations/0048_merge_20230223_1246.py diff --git a/pulp_ansible/app/migrations/0048_merge_20230223_1246.py b/pulp_ansible/app/migrations/0048_merge_20230223_1246.py new file mode 100644 index 000000000..4a8faa48f --- /dev/null +++ b/pulp_ansible/app/migrations/0048_merge_20230223_1246.py @@ -0,0 +1,14 @@ +# Generated by Django 3.2.18 on 2023-02-23 12:46 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('ansible', '0047_ansible_namespace'), + ('ansible', '0047_collectionversionmark'), + ] + + operations = [ + ] diff --git a/pulp_ansible/app/viewsets.py b/pulp_ansible/app/viewsets.py index 4b4414110..a67378d75 100644 --- a/pulp_ansible/app/viewsets.py +++ b/pulp_ansible/app/viewsets.py @@ -234,7 +234,7 @@ class CollectionVersionSignatureViewSet(NoArtifactContentUploadViewSet): serializer_class = CollectionVersionSignatureSerializer -class MarkFilter(ContentFilter): +class CollectionVersionMarkFilter(ContentFilter): """ A filter for marks. """ @@ -259,7 +259,7 @@ class CollectionVersionMarkViewSet(ContentViewSet): """ endpoint_name = "collection_marks" - filterset_class = MarkFilter + filterset_class = CollectionVersionMarkFilter queryset = CollectionVersionMark.objects.all() serializer_class = CollectionVersionMarkSerializer diff --git a/pulp_ansible/tests/functional/api/test_export_import.py b/pulp_ansible/tests/functional/api/test_export_import.py index f0cb029bd..d09cb430d 100644 --- a/pulp_ansible/tests/functional/api/test_export_import.py +++ b/pulp_ansible/tests/functional/api/test_export_import.py @@ -54,6 +54,13 @@ def test_export_then_import( repo_ver_a = ansible_repo_version_api_client.read(f"{repo_a.pulp_href}versions/2/") repo_ver_b = ansible_repo_version_api_client.read(f"{repo_b.pulp_href}versions/1/") + mark_body = { + "content_units": ["*"], + "value": "exportable-mark", + } + monitor_task(ansible_repo_api_client.mark(repo_a.pulp_href, mark_body).task) + repo_ver_a = ansible_repo_version_api_client.read(f"{repo_a.pulp_href}versions/3/") + # Prepare export exporter = gen_object_with_cleanup( exporters_pulp_api_client, @@ -107,6 +114,10 @@ def test_export_then_import( repo_ver_c.content_summary.added["ansible.collection_signature"]["count"] == repo_ver_a.content_summary.present["ansible.collection_signature"]["count"] ) + assert ( + repo_ver_c.content_summary.added["ansible.collection_mark"]["count"] + == repo_ver_a.content_summary.present["ansible.collection_mark"]["count"] + ) assert ( repo_ver_d.content_summary.added["ansible.role"]["count"] == repo_ver_b.content_summary.present["ansible.role"]["count"]