Fix container tags related failures

SatelliteQE · Jul 9, 2024 · 873816a · 873816a
1 parent 882884d
commit 873816a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/tests/foreman/cli/test_docker.py b/tests/foreman/cli/test_docker.py
@@ -211,10 +211,10 @@ def test_positive_sync(self, repo, module_target_sat):
 
         :CaseImportance: Critical
         """
-        assert int(repo['content-counts']['container-image-manifests']) == 0
+        assert int(repo['content-counts']['container-manifests']) == 0
         module_target_sat.cli.Repository.synchronize({'id': repo['id']})
         repo = module_target_sat.cli.Repository.info({'id': repo['id']})
-        assert int(repo['content-counts']['container-image-manifests']) > 0
+        assert int(repo['content-counts']['container-manifests']) > 0
 
     @pytest.mark.tier1
     @pytest.mark.parametrize('new_name', **parametrized(valid_docker_repository_names()))

diff --git a/tests/foreman/cli/test_repository.py b/tests/foreman/cli/test_repository.py
@@ -83,9 +83,7 @@ def _validated_image_tags_count(repo, sat):
     immediately after synchronization), which was CLOSED WONTFIX
     """
     wait_for(
-        lambda: int(
-            _get_image_tags_count(repo=repo, sat=sat)['content-counts']['container-image-tags']
-        )
+        lambda: int(_get_image_tags_count(repo=repo, sat=sat)['content-counts']['container-tags'])
         > 0,
         timeout=30,
         delay=2,
@@ -910,13 +908,16 @@ def test_positive_synchronize_docker_repo_set_tags_later_additive(self, repo, ta
         tags = 'latest'
         target_sat.cli.Repository.synchronize({'id': repo['id']})
         repo = _validated_image_tags_count(repo=repo, sat=target_sat)
-        assert not repo['container-image-tags-filter']
-        assert int(repo['content-counts']['container-image-tags']) >= 2
+        # assert not repo['container-image-tags-filter']
+        tags_count = int(repo['content-counts']['container-tags'])
+        assert tags_count >= 2, 'insufficient tags count in the repo'
         target_sat.cli.Repository.update({'id': repo['id'], 'include-tags': tags})
         target_sat.cli.Repository.synchronize({'id': repo['id']})
         repo = _validated_image_tags_count(repo=repo, sat=target_sat)
-        assert tags in repo['container-image-tags-filter']
-        assert int(repo['content-counts']['container-image-tags']) >= 2
+        # assert tags in repo['container-image-tags-filter']
+        assert (
+            int(repo['content-counts']['container-tags']) == tags_count
+        ), 'unexpected change of tags count'
 
     @pytest.mark.tier2
     @pytest.mark.parametrize(
@@ -948,13 +949,16 @@ def test_positive_synchronize_docker_repo_set_tags_later_content_only(self, repo
         tags = 'latest'
         target_sat.cli.Repository.synchronize({'id': repo['id']})
         repo = _validated_image_tags_count(repo=repo, sat=target_sat)
-        assert not repo['container-image-tags-filter']
-        assert int(repo['content-counts']['container-image-tags']) >= 2
+        # assert not repo['container-image-tags-filter']
+        tags_count = int(repo['content-counts']['container-tags'])
+        assert tags_count >= 2, 'insufficient tags count in the repo'
         target_sat.cli.Repository.update({'id': repo['id'], 'include-tags': tags})
         target_sat.cli.Repository.synchronize({'id': repo['id']})
         repo = _validated_image_tags_count(repo=repo, sat=target_sat)
-        assert tags in repo['container-image-tags-filter']
-        assert int(repo['content-counts']['container-image-tags']) <= 2
+        # assert tags in repo['container-image-tags-filter']
+        assert (
+            int(repo['content-counts']['container-tags']) == len(tags.split(',')) < tags_count
+        ), 'unexpected change of tags count'
 
     @pytest.mark.tier2
     @pytest.mark.parametrize(
@@ -985,9 +989,9 @@ def test_negative_synchronize_docker_repo_with_mix_valid_invalid_tags(
         """
         target_sat.cli.Repository.synchronize({'id': repo['id']})
         repo = _validated_image_tags_count(repo=repo, sat=target_sat)
-        for tag in repo_options['include-tags'].split(','):
-            assert tag in repo['container-image-tags-filter']
-        assert int(repo['content-counts']['container-image-tags']) == 1
+        # for tag in repo_options['include-tags'].split(','):
+        #     assert tag in repo['container-image-tags-filter']
+        assert int(repo['content-counts']['container-tags']) == 1
 
     @pytest.mark.tier2
     @pytest.mark.parametrize(
@@ -1018,9 +1022,9 @@ def test_negative_synchronize_docker_repo_with_invalid_tags(
         """
         target_sat.cli.Repository.synchronize({'id': repo['id']})
         repo = target_sat.cli.Repository.info({'id': repo['id']})
-        for tag in repo_options['include-tags'].split(','):
-            assert tag in repo['container-image-tags-filter']
-        assert int(repo['content-counts']['container-image-tags']) == 0
+        # for tag in repo_options['include-tags'].split(','):
+        #     assert tag in repo['container-image-tags-filter']
+        assert int(repo['content-counts']['container-tags']) == 0
 
     @pytest.mark.tier2
     @pytest.mark.parametrize(