Merge branch 'master' into no-blank-cvpage

tests/foreman/cli/test_repository.py

@@ -913,6 +913,41 @@ def test_positive_synchronize_docker_repo(self, repo, module_product, module_org
             ]
         )
 
+    @pytest.mark.tier2
+    @pytest.mark.upgrade
+    @pytest.mark.parametrize(
+        'repo_options',
+        **parametrized(
+            [
+                {
+                    'content-type': 'docker',
+                    'docker-upstream-name': CONTAINER_UPSTREAM_NAME,
+                    'name': valid_docker_repository_names()[0],
+                    'url': CONTAINER_REGISTRY_HUB,
+                }
+            ]
+        ),
+        indirect=True,
+    )
+    def test_verify_checksum_container_repo(self, repo):
+        """Check if Verify Content Checksum can be run on non container repos
+
+        :id: c8f0eb45-3cb6-41b2-aad9-52ac847d7bf8
+
+        :parametrized: yes
+
+        :expectedresults: Docker repository is created, and can be synced with
+            validate-contents set to True
+
+        :BZ: 2161209
+
+        :customerscenario: true
+        """
+        assert repo['sync']['status'] == 'Not Synced'
+        Repository.synchronize({'id': repo['id'], 'validate-contents': 'true'})
+        new_repo = Repository.info({'id': repo['id']})
+        assert new_repo['sync']['status'] == 'Success'
+
     @pytest.mark.tier2
     @pytest.mark.upgrade
     @pytest.mark.parametrize(

tests/foreman/ui/test_contentview_old.py

@@ -22,13 +22,13 @@
 import datetime
 from random import randint
 
-import pytest
 from airgun.exceptions import InvalidElementStateException, NoSuchElementException
 from airgun.session import Session
 from nailgun import entities
 from nailgun.entity_mixins import call_entity_method_with_timeout
 from navmazing import NavigationTriesExceeded
 from productmd.common import parse_nvra
+import pytest
 
 from robottelo import constants
 from robottelo.cli.contentview import ContentView