Merge remote-tracking branch 'ruda/test_api_refactoring_loader'

avocado/core/job.py

@@ -29,9 +29,9 @@ import fnmatch
 from avocado import multiplexer
 from avocado import result
 from avocado import runner
-from avocado import loader
 from avocado import runtime
 from avocado import sysinfo
+from avocado.core import loader
 from avocado.core import data_dir
 from avocado.core import exit_codes
 from avocado.core import exceptions

avocado/plugins/test_list.py

@@ -14,8 +14,8 @@
 
 import sys
 
-from avocado import loader
 from avocado import test
+from avocado.core import loader
 from avocado.core import data_dir
 from avocado.core import output
 from avocado.core import exit_codes

avocado/remote/result.py

@@ -50,7 +50,7 @@ class RemoteTestResult(HumanTestResult):
         $remote_test_dir + $test_absolute_path.
         :note: Default tests execution is translated into absolute paths too
         """
-        # TODO: Use `avocado.loader.TestLoader` instead
+        # TODO: Use `avocado.core.loader.TestLoader` instead
         self.remote.makedir(self.remote_test_dir)
         if self.args.remote_no_copy:    # Leave everything as is
             return

selftests/all/unit/avocado/loader_unittest.py

@@ -12,10 +12,11 @@ basedir = os.path.abspath(basedir)
 if os.path.isdir(os.path.join(basedir, 'avocado')):
     sys.path.append(basedir)
 
+from avocado import test
 from avocado.core import exceptions
+from avocado.core import loader
 from avocado.utils import script
-from avocado import loader
-from avocado import test
+
 
 AVOCADO_TEST_OK = """#!/usr/bin/python
 from avocado import main