virt-test: Remove dependencies on autotest

Let's remove dependencies on autotest as much as
possible, except in two instances where autotest
can't be replaced right now:

1) utils_test.run_autotest()
2) utils_test.qemu.MultiHostMigrationTest()

In such cases, let's restrict the autotest imports
to those specific functions, so the rest of the
suite can work without an autotest install.

Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>

Author: lmr

samples/bad_test.py

@@ -4,7 +4,7 @@
 :difficulty: simple
 :copyright: 2014 Red Hat Inc.
 """
-from autotest.client import utils
+from avocado.utils import process
 
 
 def run(test, params, env):
@@ -16,4 +16,4 @@ def run(test, params, env):
     :param params: Dictionary with the test parameters
     :param env: Dictionary with test environment.
     """
-    utils.run("missing_command")
+    process.run("missing_command")

samples/hostname.py

@@ -7,7 +7,7 @@
 :copyright: 2014 Red Hat Inc.
 """
 import logging
-from autotest.client import utils
+from avocado.utils import process
 
 
 def run(test, params, env):
@@ -18,5 +18,5 @@ def run(test, params, env):
     :param params: Dictionary with the test parameters
     :param env: Dictionary with test environment.
     """
-    result = utils.run("hostname")
+    result = process.run("hostname")
     logging.info("Output of 'hostname' cmd is '%s'", result.stdout)

samples/service.py

@@ -9,15 +9,16 @@
 import logging
 import time
 
-from autotest.client import utils
-from autotest.client.shared import error
-from autotest.client.shared.service import SpecificServiceManager
+from avocado.utils import process
+from avocado.core import exceptions
+from avocado.utils.service import SpecificServiceManager
 from virttest import remote
+from virttest import error_context
 
 
-# error.context_aware decorator initializes context, which provides additional
+# error_context.context_aware decorator initializes context, which provides additional
 # information on exceptions.
-@error.context_aware
+@error_context.context_aware
 def run(test, params, env):
     """
     Logs guest's hostname.
@@ -33,22 +34,23 @@ def run(test, params, env):
     :param env: Dictionary with test environment.
     """
     if params.get('test_on_guest') == "yes":
-        # error.context() is common method to log test steps used to verify
+        # error_context.context() is common method to log test steps used to verify
         # what exactly was tested.
-        error.context("Using guest.", logging.info)
+        error_context.context("Using guest.", logging.info)
         vm = env.get_vm(params["main_vm"])
         session = vm.wait_for_login()
         # RemoteRunner is object, which simulates the utils.run() behavior
         # on remote consoles
         runner = remote.RemoteRunner(session=session).run
     else:
-        error.context("Using host", logging.info)
-        runner = utils.run
+        error_context.context("Using host", logging.info)
+        runner = process.run
 
-    error.context("Initialize service manager", logging.info)
+    error_context.context("Initialize service manager", logging.info)
     service = SpecificServiceManager(params["test_service"], runner)
 
-    error.context("Testing service %s" % params["test_service"], logging.info)
+    error_context.context("Testing service %s" %
+                          params["test_service"], logging.info)
     original_status = service.status()
     logging.info("Original status=%s", original_status)
 
@@ -58,17 +60,17 @@ def run(test, params, env):
         if service.status() is not False:
             logging.error("Fail to stop service")
             service.start()
-            raise error.TestFail("Fail to stop service")
+            raise exceptions.TestFail("Fail to stop service")
         service.start()
     else:
         service.start()
         time.sleep(5)
         if service.status() is not True:
             logging.error("Fail to start service")
             service.stop()
-            raise error.TestFail("Fail to start service")
+            raise exceptions.TestFail("Fail to start service")
         service.start()
     time.sleep(5)
     if not service.status() is original_status:
-        raise error.TestFail("Fail to restore original status of the %s "
-                             "service" % params["test_service"])
+        raise exceptions.TestFail("Fail to restore original status of the %s "
+                                  "service" % params["test_service"])

shared/deps/serial/VirtIoChannel_guest_send_receive.py

@@ -127,7 +127,7 @@ def md5_init(data=None):
     try:
         md5_value = hashlib.new("md5")
     except NameError:
-            md5_value = md5.new()
+        md5_value = md5.new()
     if data:
         md5_value.update(data)
     return md5_value

shared/deps/serial/serial_host_send_receive.py

@@ -50,7 +50,7 @@ def md5_init(data=None):
     try:
         md5_value = hashlib.new("md5")
     except NameError:
-            md5_value = md5.new()
+        md5_value = md5.new()
     if data:
         md5_value.update(data)
     return md5_value

tools/build_docs.py

@@ -8,7 +8,7 @@
 import sys
 import common
 
-from autotest.client import utils
+from avocado.utils import process
 
 
 def build_docs():
@@ -22,7 +22,7 @@ def build_docs():
     failure_lines = []
     root_dir = common.virt_test_dir
     doc_dir = os.path.join(root_dir, 'documentation')
-    output = utils.system_output('make -C %s html 2>&1' % doc_dir)
+    output = process.system_output('make -C %s html 2>&1' % doc_dir)
     output_lines = output.splitlines()
     for line in output_lines:
         ignore_msg = False

tools/cd_hash.py

@@ -8,19 +8,18 @@
 import os
 import sys
 import optparse
-import logging
 
-import common
-from autotest.client.shared import logging_manager
-from autotest.client import utils
-from virttest import utils_misc
+from avocado.utils import crypto
+from avocado.core import output
+from avocado.core import log
 
 
 if __name__ == "__main__":
     parser = optparse.OptionParser("usage: %prog [options] [filenames]")
     options, args = parser.parse_args()
 
-    logging_manager.configure_logging(utils_misc.VirtLoggingConfig())
+    log.configure()
+    view = output.View()
 
     if args:
         filenames = args
@@ -34,20 +33,15 @@
         file_exists = os.path.isfile(filename)
         can_read_file = os.access(filename, os.R_OK)
         if not file_exists:
-            logging.critical("File %s does not exist!", filename)
+            view.notify(event='error', msg="File %s does not exist!" % filename)
             continue
         if not can_read_file:
-            logging.critical("File %s does not have read permissions!",
-                             filename)
+            view.notify(event='error',
+                        msg="File %s does not have read permissions!" % filename)
             continue
 
-        logging.info("Hash values for file %s", os.path.basename(filename))
-        logging.info("md5    (1m): %s", utils.hash_file(filename, 1024 * 1024,
-                                                        method="md5"))
-        logging.info("sha1   (1m): %s", utils.hash_file(filename, 1024 * 1024,
-                                                        method="sha1"))
-        logging.info(
-            "md5  (full): %s", utils.hash_file(filename, method="md5"))
-        logging.info("sha1 (full): %s", utils.hash_file(filename,
-                                                        method="sha1"))
-        logging.info("")
+        view.notify(event='message', msg="Hash values for file %s" % os.path.basename(filename))
+        view.notify(event='minor', msg="md5    (1m): %s" % crypto.hash_file(filename, 1024 * 1024, algorithm="md5"))
+        view.notify(event='minor', msg="sha1   (1m): %s" % crypto.hash_file(filename, 1024 * 1024, algorithm="sha1"))
+        view.notify(event='minor', msg="md5  (full): %s" % crypto.hash_file(filename, algorithm="md5"))
+        view.notify(event='minor', msg="sha1 (full): %s" % crypto.hash_file(filename, algorithm="sha1"))

tools/common.py

@@ -18,33 +18,38 @@
 
 :copyright: Red Hat 2012
 """
-import glob
-import os
 import sys
 import logging
-import time
-import common
-from autotest.client.shared import logging_manager
-from virttest import asset, utils_misc
+import os
+
+# simple magic for using scripts within a source tree
+basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+if os.path.isdir(os.path.join(basedir, 'virttest')):
+    sys.path.append(basedir)
+
+from virttest import asset
+
+from avocado.core import log
+from avocado.core import output
 
 
 def download_assets():
+    view = output.View()
     all_assets = asset.get_all_assets()
     if all_assets:
-        logging.info("Available download assets:")
-        logging.info("")
+        view.notify(msg="Available download assets:")
+        view.notify(msg="")
         for asset_info in all_assets:
             asset_keys = asset_info.keys()
-            logging.info("%d - %s" % (all_assets.index(asset_info) + 1,
-                                      asset_info['title']))
+            view.notify(event='minor', msg="%d - %s" % (all_assets.index(asset_info) + 1,
+                                                        asset_info['title']))
             asset_keys.pop(asset_keys.index('title'))
             asset_keys.sort()
             for k in asset_keys:
-                logging.info("    %s = %s" % (k, asset_info[k]))
-            logging.info("")
-    indexes = raw_input("%s INFO | Type the index for the assets you want to "
-                        "download (comma separated, Ctrl+C to abort): " %
-                        time.strftime("%H:%M:%S", time.localtime()))
+                view.notify(event='minor', msg="    %s = %s" % (k, asset_info[k]))
+            view.notify(msg="")
+    indexes = raw_input("Type the index for the assets you want to "
+                        "download (comma separated, leave empty to abort): ")
 
     index_list = []
 
@@ -62,7 +67,7 @@ def download_assets():
         asset.download_file(asset_info, interactive=True)
 
 if __name__ == "__main__":
-    logging_manager.configure_logging(utils_misc.VirtLoggingConfig())
+    log.configure()
     try:
         download_assets()
     except KeyboardInterrupt:

tools/download_manager.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 
 import sys
-import os
 import getpass
-import datetime
+
 from github import Github
 from github_issues import GithubIssues
 

tools/github/cache_populate.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 import sys
-import os
 import getpass
 import datetime
 

tools/github/example.py

@@ -6,6 +6,7 @@
 import datetime
 import time
 import shelve
+
 # Requires PyGithub version >= 1.13 for access to raw_data attribute
 import github
 

tools/github/github_issues.py

@@ -1,9 +1,7 @@
 #!/usr/bin/env python
 
-import sys
-import os
 import getpass
-import datetime
+
 from github import Github
 from github_issues import GithubIssues, MutableIssue
 

tools/github/label_issues.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 
-import sys
-import os
 import getpass
 import datetime
+
 from github import Github
 from github_issues import GithubIssues
 

tools/github/pulls_applied.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 
-import sys
-import os
 import getpass
 import datetime
+
 from github import Github
 from github_issues import GithubIssues
 

tools/github/stale_pulls.py

@@ -1,9 +1,6 @@
 #!/usr/bin/env python
 
-import sys
-import os
 import getpass
-import datetime
 from github import Github
 from github_issues import GithubIssues