Fixes #207 Inform user, why test is cancelled or skipped.

Signed-off-by: Petr "Stone" Hracek <[email protected]>

Author: phracek

moduleframework/mtf_scheduler.py

@@ -258,11 +258,11 @@ def show_error(self):
             # errors follow after 'normal' output with no delimiter, then with -------
             delimiter = ""
             for testcase in data['tests']:
-                if testcase.get('status') in ['ERROR', 'FAIL']:
+                if testcase.get('status') in ['ERROR', 'FAIL', 'SKIP', 'CANCEL']:
                     common.print_info(delimiter)
                     common.print_info("TEST:   {0}".format(testcase.get('id')))
-                    common.print_info("ERROR:  {0}".format(
-                        testcase.get('fail_reason')))
+                    common.print_info("{0}:  {1}".format(testcase.get('status'),
+                                                         testcase.get('fail_reason')))
                     common.print_info("        {0}".format(
                         testcase.get('logfile')))
                     delimiter = "-------------------------"

moduleframework/tests/generic/modulelint.py

@@ -34,8 +34,8 @@ class ModuleLintSigning(module_framework.AvocadoTest):
     def setUp(self):
         # it is not intended just for docker, but just docker packages are
         # actually properly signed
-        if self.moduleType != "docker":
-            self.skip("Docker specific test")
+        if self.moduleType != "docker" and self.moduleType != "openshift":
+            self.cancel("Docker or OpenShift specific test")
         super(self.__class__, self).setUp()
 
     def test(self):

moduleframework/tests/static/dockerfile_lint.py

@@ -19,7 +19,7 @@ def setUp(self):
         # actually properly signed
         self.dp = dockerlinter.DockerfileLinter()
         if self.dp.dockerfile is None:
-            self.skip("Dockerfile was not found")
+            self.cancel("Dockerfile was not found")
 
     def test_from_is_first_directive(self):
         self.assertTrue(self.dp.check_from_is_first(), msg="FROM instruction is not first.")

moduleframework/tests/static/helpmd_lint.py

@@ -42,7 +42,7 @@ def setUp(self):
         self.helpmd = helpfile_linter.HelpMDLinter()
         self.dp = dockerlinter.DockerfileLinter()
         if self.helpmd.help_md is None or self.dp.dockerfile is None:
-            self.skip("Help file or Dockerfile was not found")
+            self.cancel("Help file or Dockerfile was not found")
 
     def tearDown(self, *args, **kwargs):
         pass