Skip to content

Commit

Permalink
Fix typo Add sync test
Browse files Browse the repository at this point in the history
fixes: pulp#1325
  • Loading branch information
rochacbruno committed Feb 20, 2023
1 parent da4ecd3 commit 80994f8
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pulp_ansible/app/modelresource.py
Expand Up @@ -149,7 +149,7 @@ class Meta:
CollectionDeprecationResource,
TagResource,
CollectionVersionContentResource,
CollectionVersionMark,
CollectionVersionMarkResource,
CollectionVersionSignatureResource,
RoleContentResource,
]
58 changes: 58 additions & 0 deletions pulp_ansible/tests/functional/api/collection/test_marks.py
@@ -1,9 +1,16 @@
import pytest
from pulp_smash.pulp3.bindings import monitor_task
from pulp_smash.pulp3.utils import (
get_added_content_summary,
get_content,
get_content_summary,
gen_distribution,
get_removed_content_summary,
)
from pulp_ansible.tests.functional.utils import (
gen_ansible_remote,
)
from pulpcore.client.pulp_ansible import AnsibleRepositorySyncURL


def test_add_mark_to_collection_version(
Expand Down Expand Up @@ -58,3 +65,54 @@ def test_add_mark_to_collection_version(
assert ansible_repo.latest_version_href.endswith("/3/")
# Ensure mark is removed from repo contents
assert get_removed_content_summary(ansible_repo.to_dict()) == {"ansible.collection_mark": 1}


@pytest.fixture
def distro_serving_one_marked_one_unmarked_collection(
build_and_upload_collection,
ansible_repo,
ansible_repo_api_client,
ansible_distro_api_client,
):
"""Create a distro serving two collections, one marked, one unmarked."""
collections = []
for i in range(2):
_, collection_url = build_and_upload_collection()
collections.append(collection_url)

body = {"add_content_units": collections}
monitor_task(ansible_repo_api_client.modify(ansible_repo.pulp_href, body).task)

body = {"content_units": collections[:1], "value": "marked-on-sync-test"}
monitor_task(ansible_repo_api_client.mark(ansible_repo.pulp_href, body).task)

body = gen_distribution(repository=ansible_repo.pulp_href)
distro_href = monitor_task(ansible_distro_api_client.create(body).task).created_resources[0]
return ansible_distro_api_client.read(distro_href)


@pytest.mark.pulp_on_localhost
def test_sync_marks(
ansible_repo_factory,
distro_serving_one_marked_one_unmarked_collection,
ansible_remote_collection_api_client,
gen_object_with_cleanup,
ansible_repo_api_client,
):
"""Test that marks are also synced."""
distro = distro_serving_one_marked_one_unmarked_collection
new_repo = ansible_repo_factory()

# Create Remote
body = gen_ansible_remote(distro.client_url, include_pulp_auth=True)
remote = gen_object_with_cleanup(ansible_remote_collection_api_client, body)

# Sync
repository_sync_data = AnsibleRepositorySyncURL(remote=remote.pulp_href)
sync_response = ansible_repo_api_client.sync(new_repo.pulp_href, repository_sync_data)
monitor_task(sync_response.task)
repo = ansible_repo_api_client.read(new_repo.pulp_href)

content_response = get_content(repo.to_dict())
assert len(content_response["ansible.collection_version"]) == 2
assert len(content_response["ansible.collection_mark"]) == 1

0 comments on commit 80994f8

Please sign in to comment.