From 8dbcdd2ba9723ac2330bb93f4391120b5f73c531 Mon Sep 17 00:00:00 2001 From: Vladimir Sedmik Date: Tue, 30 Apr 2024 11:18:09 +0200 Subject: [PATCH] Merge yum/file and docker/AC into one test case --- robottelo/host_helpers/capsule_mixins.py | 12 ++ tests/foreman/cli/test_capsulecontent.py | 180 +++++++---------------- 2 files changed, 66 insertions(+), 126 deletions(-) diff --git a/robottelo/host_helpers/capsule_mixins.py b/robottelo/host_helpers/capsule_mixins.py index 4a75e095c41..d30c4a4e2be 100644 --- a/robottelo/host_helpers/capsule_mixins.py +++ b/robottelo/host_helpers/capsule_mixins.py @@ -155,6 +155,18 @@ def get_published_repo_url(self, org, prod, repo, lce=None, cv=None): return f'{self.url}/pulp/content/{org}/{lce}/{cv}/custom/{prod}/{repo}/' return f'{self.url}/pulp/content/{org}/Library/custom/{prod}/{repo}/' + def get_artifacts(self, since=None, tz='UTC'): + """Get paths of pulp artifact. + + :param str since: Creation time of artifact we are looking for. + :param str tz: Time zone for `since` param. + :return: A list of artifacts paths. + """ + query = f'find {PULP_ARTIFACT_DIR} -type f' + if since: + query = f'{query} -newermt "{since} {tz}"' + return self.execute(query).stdout.splitlines() + def get_artifact_info(self, checksum=None, path=None): """Returns information about pulp artifact if found on FS, throws FileNotFoundError otherwise. diff --git a/tests/foreman/cli/test_capsulecontent.py b/tests/foreman/cli/test_capsulecontent.py index c0927d7a676..12e84d3ff37 100644 --- a/tests/foreman/cli/test_capsulecontent.py +++ b/tests/foreman/cli/test_capsulecontent.py @@ -21,7 +21,6 @@ from robottelo.constants import ( CONTAINER_REGISTRY_HUB, CONTAINER_UPSTREAM_NAME, - PULP_ARTIFACT_DIR, ) from robottelo.constants.repos import ANSIBLE_GALAXY, CUSTOM_FILE_REPO from robottelo.content_info import get_repo_files_urls_by_url @@ -293,109 +292,8 @@ def test_positive_update_counts(target_sat, module_capsule_configured): @pytest.mark.parametrize( 'module_synced_content', [ - [ - {'content_type': 'yum', 'url': settings.repos.yum_0.url}, - {'content_type': 'file', 'url': CUSTOM_FILE_REPO}, - ] - ], - indirect=True, - ids=['content'], -) -@pytest.mark.parametrize('content_type', ['yum', 'file']) -@pytest.mark.parametrize('damage_type', ['destroy', 'corrupt']) -def test_positive_repair_yum_file_artifacts( - module_target_sat, - module_capsule_configured, - module_capsule_artifact_cleanup, - module_org, - module_synced_content, - damage_type, - repair_type, - content_type, -): - """Test the verify-checksum task repairs particular RPM and FILE artifacts correctly - at the Capsule side using one of its methods when they were removed or corrupted before. - - :id: f818f537-94b0-4d14-adf1-643ead828ade - - :parametrized: yes - - :setup: - 1. Have a Satellite with registered external Capsule. - 2. Clean up all previously synced artifacts from the Capsule. - 3. Create yum and file type repository, publish it in a CVV and promote to an LCE. - 4. Assign the Capsule with the LCE and sync it. - - :steps: - 1. Pick one of the published files. - 2. Cause desired type of damage to his artifact and verify the effect. - 3. Trigger desired variant of repair (verify_checksum) task. - 4. Check if the artifact is back in shape. - - :expectedresults: - 1. Artifact is stored correctly based on the checksum. - 2. All variants of verify_checksum task are able to repair all types of damage. - - :BZ: 2127537 - - :customerscenario: true - - """ - repo = next(repo for repo in module_synced_content.repos if repo.content_type == content_type) - - # Pick one of the published files. - caps_repo_url = module_capsule_configured.get_published_repo_url( - org=module_org.label, - lce=None if repair_type == 'repo' else module_synced_content.lce.label, - cv=None if repair_type == 'repo' else module_synced_content.cv.label, - prod=module_synced_content.prod.label, - repo=repo.label, - ) - cap_files_urls = get_repo_files_urls_by_url( - caps_repo_url, extension='rpm' if content_type == 'yum' else 'iso' - ) - - file_url = random.choice(cap_files_urls) - file_sum = module_target_sat.checksum_by_url(file_url, sum_type='sha256sum') - file_ai = module_capsule_configured.get_artifact_info(checksum=file_sum) - - # Cause desired type of damage to his artifact and verify the effect. - if damage_type == 'destroy': - module_capsule_configured.execute(f'rm -f {file_ai.path}') - with pytest.raises(FileNotFoundError): - module_capsule_configured.get_artifact_info(checksum=file_sum) - with pytest.raises(AssertionError): - module_target_sat.checksum_by_url(file_url) - elif damage_type == 'corrupt': - res = module_capsule_configured.execute( - f'truncate -s {random.randint(1, file_ai.size)} {file_ai.path}' - ) - assert res.status == 0, f'Artifact truncation failed: {res.stderr}' - assert ( - module_capsule_configured.get_artifact_info(checksum=file_sum) != file_ai - ), 'Artifact corruption failed' - else: - raise ValueError(f'Unsupported damage type: {damage_type}') - - # Trigger desired variant of repair (verify_checksum) task. - opts = {'id': module_capsule_configured.nailgun_capsule.id} - if repair_type == 'repo': - opts.update({'repository-id': repo.id}) - elif repair_type == 'cv': - opts.update({'content-view-id': module_synced_content.cv.id}) - elif repair_type == 'lce': - opts.update({'lifecycle-environment-id': module_synced_content.lce.id}) - module_target_sat.cli.Capsule.content_verify_checksum(opts) - - # Check if the artifact is back in shape. - fixed_ai = module_capsule_configured.get_artifact_info(checksum=file_sum) - assert fixed_ai == file_ai, f'Artifact restoration failed: {fixed_ai} != {file_ai}' - - -@pytest.mark.parametrize('repair_type', ['repo', 'cv', 'lce']) -@pytest.mark.parametrize( - 'module_synced_content', - [ + {'content_type': 'yum', 'url': settings.repos.yum_0.url}, + {'content_type': 'file', 'url': CUSTOM_FILE_REPO}, { 'content_type': 'docker', 'docker_upstream_name': CONTAINER_UPSTREAM_NAME, @@ -410,49 +308,74 @@ def test_positive_repair_yum_file_artifacts( }, ], indirect=True, - ids=['docker', 'AC'], + ids=['yum', 'file', 'docker', 'AC'], ) @pytest.mark.parametrize('damage_type', ['destroy', 'corrupt']) -def test_positive_repair_docker_AC_artifacts( - module_target_sat, module_capsule_configured, module_synced_content, damage_type, repair_type +def test_positive_repair_artifacts( + module_target_sat, + module_capsule_configured, + module_capsule_artifact_cleanup, + module_synced_content, + module_org, + damage_type, + repair_type, ): - """Test the verify-checksum task repairs particular docker and ansible-collection artifacts - correctly at the Capsule side using one of its methods when they were removed or corrupted - before. + """Test the verify-checksum task repairs artifacts of each supported content type correctly + at the Capsule side using each of its options when they were removed or corrupted before. - :id: b0e1a163-bf30-48bf-8d27-68c689ee0896 + :id: cdc2c4c7-72e1-451a-8bde-7f4340a5b73a :parametrized: yes :setup: 1. Have a Satellite with registered external Capsule. - 2. Create docker and ansible-collection type repository, publish it in a CVV and promote + 2. Clean up all previously synced artifacts from the Capsule to ensure new artifacts are + created on Capsule sync with expected creation time. (the fixtures order matters) + 3. Per parameter, create repository of each content type, publish it in a CV and promote to an LCE. - 3. Assign the Capsule with the LCE and sync it. + 4. Assign the Capsule with the LCE and sync it. :steps: - 1. Get all artifacts synced recently by the `module_synced_content` fixture. - 2. Pick one artifact and cause desired type of damage and verify the effect. - 3. Trigger desired variant of repair (verify_checksum) task. + 1. Based on the repository content type + - find and pick one artifact for particular published file, or + - pick one artifact synced recently by the `module_synced_content` fixture. + 2. Cause desired type of damage to the artifact and verify the effect. + 3. Trigger desired variant of the repair (verify_checksum) task. 4. Check if the artifact is back in shape. :expectedresults: - 1. Artifact is stored correctly based on the checksum. - 2. All variants of verify_checksum task are able to repair all types of damage. + 1. Artifact is stored correctly based on the checksum. (yum and file) + 2. All variants of verify_checksum task are able to repair all types of damage for all + supported content types. :BZ: 2127537 :customerscenario: true """ - # Get all artifacts synced recently by the `module_synced_content` fixture. - artifacts = module_capsule_configured.execute( - f'find {PULP_ARTIFACT_DIR} -type f -newermt "{module_synced_content.sync_time} UTC"' - ).stdout.splitlines() - assert len(artifacts) > 0, 'No NEW artifacts found' - - # Pick one artifact and cause desired type of damage and verify the effect. - ai = module_capsule_configured.get_artifact_info(path=random.choice(artifacts)) + # Based on the repository content type + if module_synced_content.repos[0].content_type in ['yum', 'file']: + # Find and pick one artifact for particular published file. + caps_repo_url = module_capsule_configured.get_published_repo_url( + org=module_org.label, + lce=None if repair_type == 'repo' else module_synced_content.lce.label, + cv=None if repair_type == 'repo' else module_synced_content.cv.label, + prod=module_synced_content.prod.label, + repo=module_synced_content.repos[0].label, + ) + cap_files_urls = get_repo_files_urls_by_url( + caps_repo_url, + extension='rpm' if module_synced_content.repos[0].content_type == 'yum' else 'iso', + ) + url = random.choice(cap_files_urls) + sum = module_target_sat.checksum_by_url(url, sum_type='sha256sum') + ai = module_capsule_configured.get_artifact_info(checksum=sum) + else: + artifacts = module_capsule_configured.get_artifacts(since=module_synced_content.sync_time) + assert len(artifacts) > 0, 'No NEW artifacts found' + ai = module_capsule_configured.get_artifact_info(path=random.choice(artifacts)) + + # Cause desired type of damage to the artifact and verify the effect. if damage_type == 'destroy': module_capsule_configured.execute(f'rm -f {ai.path}') with pytest.raises(FileNotFoundError): @@ -481,3 +404,8 @@ def test_positive_repair_docker_AC_artifacts( # Check if the artifact is back in shape. fixed_ai = module_capsule_configured.get_artifact_info(path=ai.path) assert fixed_ai == ai, f'Artifact restoration failed: {fixed_ai} != {ai}' + + if module_synced_content.repos[0].content_type in ['yum', 'file']: + assert ( + module_target_sat.checksum_by_url(url, sum_type='sha256sum') == ai.sum + ), 'Published file is unaccessible or corrupted'