Merge branch 'test_api_refactoring_remote'

avocado/core/plugins/remote.py

@@ -17,7 +17,8 @@
 import getpass
 
 from avocado.core.plugins import plugin
-from avocado.remote import RemoteTestResult, RemoteTestRunner
+from avocado.core.remote import RemoteTestResult
+from avocado.core.remote import RemoteTestRunner
 from avocado.utils import remote
 
 

avocado/core/plugins/vm.py

@@ -17,8 +17,8 @@
 import getpass
 
 from avocado.core.plugins import plugin
-from avocado.remote import VMTestResult
-from avocado.remote import RemoteTestRunner
+from avocado.core.remote import VMTestResult
+from avocado.core.remote import RemoteTestRunner
 from avocado.utils import virt
 
 

avocado/remote/__init__.py → avocado/core/remote/__init__.py

@@ -12,6 +12,6 @@
 # Copyright: Red Hat Inc. 2014-2015
 # Author: Ruda Moura <rmoura@redhat.com>
 
-from avocado.remote.test import RemoteTest
-from avocado.remote.result import RemoteTestResult, VMTestResult
-from avocado.remote.runner import RemoteTestRunner
+from avocado.core.remote.test import RemoteTest
+from avocado.core.remote.result import RemoteTestResult, VMTestResult
+from avocado.core.remote.runner import RemoteTestRunner

avocado/remote/runner.py → avocado/core/remote/runner.py

@@ -20,7 +20,7 @@ import re
 from avocado.core import exceptions
 from avocado.core import status
 from avocado.core.runner import TestRunner
-from avocado.remote.test import RemoteTest
+from avocado.core.remote.test import RemoteTest
 from avocado.utils import archive
 from fabric.exceptions import CommandTimeout
 

selftests/all/unit/avocado/remote_unittest.py

@@ -5,8 +5,8 @@ import os
 
 from flexmock import flexmock, flexmock_teardown
 
-from avocado import remote
 from avocado import data_dir
+from avocado.core import remote
 from avocado.utils import archive
 from avocado.utils import remote as utils_remote
 

selftests/all/unit/avocado/vm_unittest.py

@@ -5,7 +5,8 @@ import os
 
 from flexmock import flexmock, flexmock_teardown
 
-from avocado.remote import VMTestResult, RemoteTestResult
+from avocado.core.remote import VMTestResult
+from avocado.core.remote import RemoteTestResult
 from avocado.utils import virt
 
 

setup.py

@@ -111,7 +111,7 @@ if __name__ == '__main__':
                     'avocado.core.plugins',
                     'avocado.linux',
                     'avocado.utils',
-                    'avocado.remote',
+                    'avocado.core.remote',
                     'avocado.restclient',
                     'avocado.restclient.cli',
                     'avocado.restclient.cli.args',