Merge pull request avocado-framework#55 from clebergnu/api_review_2nd…

…_round

API review: sync with the avocado API changes

avocado/core/plugins/virt_bootstrap.py

@@ -15,7 +15,7 @@
 import os
 import urllib2
 
-from avocado import data_dir
+from avocado.core import data_dir
 from avocado.core import output
 from avocado.core.plugins import plugin
 from avocado.utils import download

avocado/virt/defaults.py

@@ -16,9 +16,9 @@
 Default values used in tests and plugin code.
 """
 
-from avocado import data_dir
-from avocado.settings import settings
-from avocado.settings import SettingsError
+from avocado.core import data_dir
+from avocado.core.settings import settings
+from avocado.core.settings import SettingsError
 from avocado.virt.qemu import path
 
 try:

avocado/virt/qemu/machine.py

@@ -23,7 +23,7 @@
 import copy
 
 from avocado.core import exceptions
-from avocado import aexpect
+from avocado.core import aexpect
 from avocado.utils import genio
 from avocado.utils import process
 from avocado.utils import remote

avocado/virt/test.py

@@ -14,12 +14,12 @@
 # Author: Lucas Meneghel Rodrigues <[email protected]>
 
 import os
-from avocado import test
+from avocado import Test
 from avocado.utils import process
 from avocado.virt.qemu import machine
 
 
-class VirtTest(test.Test):
+class VirtTest(Test):
 
     def __init__(self, methodName='runTest', name=None, params=None,
                  base_logdir=None, tag=None, job=None, runner_queue=None):