loader: Avoid using Test-inherited classes for not-tests

The Loader can report non-tests which are not intended for execution but
only for listing purposes. Let's avoid inheriting them from avocado Test
as it is not really necessary as the tests are basically dummy entities
which does not really do anything.
Signed-off-by: NLukáš Doktor <ldoktor@redhat.com>

avocado/core/exceptions.py

@@ -75,17 +75,6 @@ class TestError(TestBaseException):
     status = "ERROR"
 
 
-class NotATestError(TestBaseException):
-
-    """
-    Indicates that the file is not a test.
-
-    Causes: Non executable, non python file or python module without
-    an avocado test class in it.
-    """
-    status = "NOT_A_TEST"
-
-
 class TestNotFoundError(TestBaseException):
 
     """

avocado/core/loader.py

@@ -43,6 +43,12 @@ AVAILABLE = None
 ALL = True
 
 
+class MissingTest(object):
+    """
+    Class representing reference which failed to be discovered
+    """
+
+
 def filter_test_tags(test_suite, filter_by_tags, include_empty=False):
     """
     Filter the existing (unfiltered) test suite based on tags
@@ -209,10 +215,10 @@ class TestLoaderProxy(object):
         Update the mappings according the current initialized plugins
         """
         # Plugins are initialized, let's update mappings
-        self._label_mapping = {test.MissingTest: "MISSING"}
+        self._label_mapping = {MissingTest: "MISSING"}
         for plugin in self._initialized_plugins:
             self._label_mapping.update(plugin.get_type_label_mapping())
-        self._decorator_mapping = {test.MissingTest:
+        self._decorator_mapping = {MissingTest:
                                    output.TERM_SUPPORT.fail_header_str}
         for plugin in self._initialized_plugins:
             self._decorator_mapping.update(plugin.get_decorator_mapping())
@@ -275,7 +281,7 @@ class TestLoaderProxy(object):
                     unhandled_references.append(reference)
         if unhandled_references:
             if which_tests:
-                tests.extend([(test.MissingTest, {'name': reference})
+                tests.extend([(MissingTest, {'name': reference})
                               for reference in unhandled_references])
             else:
                 raise LoaderUnhandledReferenceError(unhandled_references,
@@ -453,6 +459,12 @@ def add_loader_options(parser):
                               'run tests from files'))
 
 
+class NotATest(object):
+    """
+    Class representing something that is not a test
+    """
+
+
 class FileLoader(TestLoader):
 
     """
@@ -469,8 +481,8 @@ class FileLoader(TestLoader):
     @staticmethod
     def get_type_label_mapping():
         return {test.SimpleTest: 'SIMPLE',
-                test.NotATest: 'NOT_A_TEST',
-                test.MissingTest: 'MISSING',
+                NotATest: 'NOT_A_TEST',
+                MissingTest: 'MISSING',
                 BrokenSymlink: 'BROKEN_SYMLINK',
                 AccessDeniedPath: 'ACCESS_DENIED',
                 test.Test: 'INSTRUMENTED'}
@@ -478,8 +490,8 @@ class FileLoader(TestLoader):
     @staticmethod
     def get_decorator_mapping():
         return {test.SimpleTest: output.TERM_SUPPORT.healthy_str,
-                test.NotATest: output.TERM_SUPPORT.warn_header_str,
-                test.MissingTest: output.TERM_SUPPORT.fail_header_str,
+                NotATest: output.TERM_SUPPORT.warn_header_str,
+                MissingTest: output.TERM_SUPPORT.fail_header_str,
                 BrokenSymlink: output.TERM_SUPPORT.fail_header_str,
                 AccessDeniedPath: output.TERM_SUPPORT.fail_header_str,
                 test.Test: output.TERM_SUPPORT.healthy_str}
@@ -705,7 +717,7 @@ class FileLoader(TestLoader):
                 else:
                     # Module does not have an avocado test class inside, and
                     # it's not executable. Not a Test.
-                    return make_broken(test.NotATest, test_path)
+                    return make_broken(NotATest, test_path)
 
         # Since a lot of things can happen here, the broad exception is
         # justified. The user will get it unadulterated anyway, and avocado
@@ -718,7 +730,7 @@ class FileLoader(TestLoader):
                 # execute it.
                 return self._make_test(test.SimpleTest, test_path)
             else:
-                return make_broken(test.NotATest, test_path)
+                return make_broken(NotATest, test_path)
 
     @staticmethod
     def _make_test(klass, uid):
@@ -757,7 +769,7 @@ class FileLoader(TestLoader):
                     return self._make_test(test.SimpleTest,
                                            test_path)
                 else:
-                    return make_broken(test.NotATest, test_path)
+                    return make_broken(NotATest, test_path)
         else:
             if os.path.islink(test_path):
                 try:
@@ -781,7 +793,7 @@ class FileLoader(TestLoader):
                         return self._make_avocado_tests(test_path, make_broken,
                                                         subtests_filter,
                                                         test_name)
-        return make_broken(test.MissingTest, test_name)
+        return make_broken(MissingTest, test_name)
 
 
 class ExternalLoader(TestLoader):

avocado/core/test.py

@@ -931,34 +931,6 @@ class ExternalRunnerTest(SimpleTest):
                 os.chdir(pre_cwd)
 
 
-class MissingTest(Test):
-
-    """
-    Handle when there is no such test module in the test directory.
-    """
-
-    def test(self):
-        e_msg = ('Test %s could not be found in the test dir %s '
-                 '(or test path does not exist)' %
-                 (self.name, data_dir.get_test_dir()))
-        raise exceptions.TestNotFoundError(e_msg)
-
-
-class NotATest(Test):
-
-    """
-    The file is not a test.
-
-    Either a non executable python module with no avocado test class in it,
-    or a regular, non executable file.
-    """
-
-    def test(self):
-        e_msg = ('File %s is not executable and does not contain an avocado '
-                 'test class in it ' % self.name)
-        raise exceptions.NotATestError(e_msg)
-
-
 class MockingTest(Test):
 
     """

selftests/unit/test_loader.py

@@ -5,7 +5,6 @@ import tempfile
 import unittest
 
 from avocado.core import test
-from avocado.core import exceptions
 from avocado.core import loader
 from avocado.utils import script
 
@@ -235,13 +234,8 @@ class LoaderTest(unittest.TestCase):
                                              'avocado_loader_unittest',
                                              mode=DEFAULT_NON_EXEC_MODE)
         simple_test.save()
-        test_class, test_parameters = (
-            self.loader.discover(simple_test.path, loader.ALL)[0])
-        self.assertTrue(test_class == test.NotATest, test_class)
-        test_parameters['name'] = test.TestName(0, test_parameters['name'])
-        test_parameters['base_logdir'] = self.tmpdir
-        tc = test_class(**test_parameters)
-        self.assertRaises(exceptions.NotATestError, tc.test)
+        test_class, _ = self.loader.discover(simple_test.path, loader.ALL)[0]
+        self.assertTrue(test_class == loader.NotATest, test_class)
         simple_test.remove()
 
     def test_load_pass(self):
@@ -249,8 +243,8 @@ class LoaderTest(unittest.TestCase):
                                                    AVOCADO_TEST_OK,
                                                    'avocado_loader_unittest')
         avocado_pass_test.save()
-        test_class, test_parameters = (
-            self.loader.discover(avocado_pass_test.path, loader.ALL)[0])
+        test_class, _ = self.loader.discover(avocado_pass_test.path,
+                                             loader.ALL)[0]
         self.assertTrue(test_class == 'PassTest', test_class)
         avocado_pass_test.remove()
 
@@ -260,13 +254,9 @@ class LoaderTest(unittest.TestCase):
                                                     'avocado_loader_unittest',
                                                     mode=DEFAULT_NON_EXEC_MODE)
         avocado_not_a_test.save()
-        test_class, test_parameters = (
-            self.loader.discover(avocado_not_a_test.path, loader.ALL)[0])
-        self.assertTrue(test_class == test.NotATest, test_class)
-        test_parameters['name'] = test.TestName(0, test_parameters['name'])
-        test_parameters['base_logdir'] = self.tmpdir
-        tc = test_class(**test_parameters)
-        self.assertRaises(exceptions.NotATestError, tc.test)
+        test_class, _ = self.loader.discover(avocado_not_a_test.path,
+                                             loader.ALL)[0]
+        self.assertTrue(test_class == loader.NotATest, test_class)
         avocado_not_a_test.remove()
 
     def test_load_not_a_test_exec(self):
@@ -304,13 +294,9 @@ class LoaderTest(unittest.TestCase):
                                                      'avocado_loader_unittest',
                                                      mode=DEFAULT_NON_EXEC_MODE)
         avocado_simple_test.save()
-        test_class, test_parameters = (
-            self.loader.discover(avocado_simple_test.path, loader.ALL)[0])
-        self.assertTrue(test_class == test.NotATest)
-        test_parameters['name'] = test.TestName(0, test_parameters['name'])
-        test_parameters['base_logdir'] = self.tmpdir
-        tc = test_class(**test_parameters)
-        self.assertRaises(exceptions.NotATestError, tc.test)
+        test_class, _ = self.loader.discover(avocado_simple_test.path,
+                                             loader.ALL)[0]
+        self.assertTrue(test_class == loader.NotATest)
         avocado_simple_test.remove()
 
     def test_multiple_methods(self):
@@ -373,7 +359,7 @@ class LoaderTest(unittest.TestCase):
         avocado_pass_test.save()
         test_class, test_parameters = (
             self.loader.discover(avocado_pass_test.path, loader.ALL)[0])
-        self.assertTrue(test_class == test.NotATest)
+        self.assertTrue(test_class == loader.NotATest)
         avocado_pass_test.remove()
 
     def test_load_tagged_nested(self):
@@ -382,10 +368,9 @@ class LoaderTest(unittest.TestCase):
                                                      'avocado_loader_unittest',
                                                      DEFAULT_NON_EXEC_MODE)
         avocado_nested_test.save()
-        test_class, test_parameters = (
-            self.loader.discover(avocado_nested_test.path, loader.ALL)[0])
-        results = self.loader.discover(avocado_nested_test.path, loader.ALL)
-        self.assertTrue(test_class == test.NotATest)
+        test_class, _ = self.loader.discover(avocado_nested_test.path,
+                                             loader.ALL)[0]
+        self.assertTrue(test_class == loader.NotATest)
         avocado_nested_test.remove()
 
     def test_load_multiple_imports(self):