Merge pull request #76 from phracek/fixing_ci_tests

Fixing CI tests. DockerLint in two classes and rpmvalidation logs problems

Author: phracek

tools/modulelint.py

@@ -28,82 +28,82 @@
 from moduleframework.avocado_testers import container_avocado_test
 
 
-class DockerfileLinter(module_framework.AvocadoTest):
+class DockerfileSanitize(container_avocado_test.ContainerAvocadoTest):
     """
     :avocado: enable
 
     """
 
-    dp = None
+    dp = dockerlinter.DockerfileLinter(os.path.join(os.getcwd(), ".."))
 
-    def setUp(self):
-        # it is not intended just for docker, but just docker packages are
-        # actually properly signed
-        self.dp = dockerlinter.DockerfileLinter(os.path.join(os.getcwd(), ".."))
-        if self.dp.dockerfile is None:
-            self.skip()
-
-    def testDockerFromBaseruntime(self):
+    def test_docker_from_baseruntime(self):
         self.assertTrue(self.dp.check_baseruntime())
 
-    def testDockerNodocs(self):
-        self.start()
-        installed_pkgs = self.run("rpm -qa --qf '%{{NAME}}\n'", ignore_status=True).stdout
-        # This returns a list of packages defined in config.yaml for testing
-        # e.g. ["bash", "rpm", "memcached"] in case of memcached
-        pkgs = self.backend.getPackageList()
-        for pkg in installed_pkgs.split('\n'):
-            if pkg in pkgs:
-                all_docs = self.run("rpm -qd %s" % pkg).stdout
-                for doc in all_docs.strip().split('\n'):
-                    self.assertNotEqual(0, self.run("test -e %s" % doc, ignore_status=True).exit_status)
-
-    def testDockerCleanAll(self):
-        self.start()
-        pkg_mgr = "yum"
-        # Detect distro in image
-        distro = self.run("cat /etc/os-release").stdout
-        if 'NAME=Fedora' in distro:
-            pkg_mgr = "dnf"
-        # Look, whether we have solv files in /var/cache/<pkg_mgr>/*.solv
-        # dnf|yum clean all deletes the file *.solv
-        ret = self.run("ls /var/cache/%s/*.solv" % pkg_mgr, ignore_status=True)
-        self.assertNotEqual(0, ret.exit_status)
-        self.assertEqual("", ret.stdout.strip())
-
-    def testArchitectureInEnvAndLabelExists(self):
+    def test_architecture_in_env_and_label_exists(self):
         self.assertTrue(self.dp.get_docker_specific_env("ARCH="))
         self.assertTrue(self.dp.get_specific_label("architecture"))
 
-    def testNameInEnvAndLabelExists(self):
+    def test_name_in_env_and_label_exists(self):
         self.assertTrue(self.dp.get_docker_specific_env("NAME="))
         self.assertTrue(self.dp.get_specific_label("name"))
 
-    def testReleaseLabelExists(self):
+    def test_release_label_exists(self):
         self.assertTrue(self.dp.get_specific_label("release"))
 
-    def testVersionLabelExists(self):
+    def test_version_label_exists(self):
         self.assertTrue(self.dp.get_specific_label("version"))
 
-    def testComRedHatComponentLabelExists(self):
+    def test_com_red_hat_component_label_exists(self):
         self.assertTrue(self.dp.get_specific_label("com.redhat.component"))
 
-    def testIok8sDescriptionExists(self):
+    def test_iok8s_description_exists(self):
         self.assertTrue(self.dp.get_specific_label("io.k8s.description"))
 
-    def testIoOpenshiftExposeServicesExists(self):
+    def test_io_openshift_expose_services_exists(self):
         label_io_openshift = "io.openshift.expose-services"
         exposes = self.dp.get_docker_expose()
         label_list = self.dp.get_docker_labels()
         self.assertTrue(label_list[label_io_openshift])
         for exp in exposes:
             self.assertTrue("%s" % exp in label_list[label_io_openshift])
 
-    def testIoOpenShiftTagsExists(self):
+    def test_io_openshift_tags_exists(self):
         label_list = self.dp.get_docker_labels()
         self.assertTrue("io.openshift.tags" in label_list)
 
 
+class DockerfileLinterInContainer(container_avocado_test.ContainerAvocadoTest):
+    """
+    :avocado: enable
+
+    """
+
+    def test_docker_nodocs(self):
+        self.start()
+        installed_pkgs = self.run("rpm -qa --qf '%{{NAME}}\n'", verbose=False).stdout
+        # This returns a list of packages defined in config.yaml for testing
+        # e.g. ["bash", "rpm", "memcached"] in case of memcached
+        pkgs = self.backend.getPackageList()
+        list_pkg = [pkg for pkg in installed_pkgs.split('\n') if pkg in pkgs]
+        for pkg in list_pkg:
+            all_docs = self.run("rpm -qd %s" % pkg, verbose=False).stdout
+            for doc in all_docs.strip().split('\n'):
+                self.assertNotEqual(0, self.run("test -e %s" % doc, ignore_status=True).exit_status)
+
+    def test_docker_clean_all(self):
+        self.start()
+        pkg_mgr = "yum"
+        # Detect distro in image
+        distro = self.run("cat /etc/os-release").stdout
+        if 'NAME=Fedora' in distro:
+            pkg_mgr = "dnf"
+        # Look, whether we have solv files in /var/cache/<pkg_mgr>/*.solv
+        # dnf|yum clean all deletes the file *.solv
+        ret = self.run("ls /var/cache/%s/*.solv" % pkg_mgr, ignore_status=True)
+        self.assertNotEqual(0, ret.exit_status)
+        self.assertEqual("", ret.stdout.strip())
+
+
 class DockerLint(container_avocado_test.ContainerAvocadoTest):
     """
     :avocado: enable

tools/modulelint/rpmvalidation.py

@@ -88,17 +88,19 @@ def _compare_fhs(self, filepath):
             return True
         for path in self.fhs_base_paths:
             if filepath.startswith(path):
-                self.log.info("%s starts with FSH %s" % (filepath, path))
+                # Log is not needed I guess. It causes troubles in Travis CI.
+                # log is pretty huge.
+                # self.log.debug("%s starts with FSH %s" % (filepath, path))
                 return True
         self.log.info("%s not found in %s" % (filepath, self.fhs_base_paths))
         return False
 
     def test(self):
-        allpackages = filter(bool, self.run("rpm -qa").stdout.split("\n"))
+        allpackages = filter(bool, self.run("rpm -qa", verbose=False).stdout.split("\n"))
         common.print_debug(allpackages)
         for package in allpackages:
             if 'filesystem' in package:
                 continue
-            for package_file in filter(bool, self.run("rpm -ql %s" % package).stdout.split("\n")):
+            for package_file in filter(bool, self.run("rpm -ql %s" % package, verbose=False).stdout.split("\n")):
                 if not self._compare_fhs(package_file):
                     self.fail("(%s): File [%s] violates the FHS." % (package, package_file))