Work to get KVM autotest upstream

index c89e12e..46de723 100644
@@ -9,7 +9,7 @@ import shutil
 from autotest_lib.client.common_lib import utils, error
 
 import kvm_utils
-import kvm_log
+import logging
 import ppm_utils
 
 

@@ -23,7 +23,7 @@ def handle_var(vm, params, varname):
 
 def barrier_2(vm, words, fail_if_stuck_for, stuck_detection_history, output_dir, data_scrdump_filename, current_step_num):
     if len(words) < 7:
-        kvm_log.error("Bad barrier_2 command line")
+        logging.error("Bad barrier_2 command line")
         return False
 
     cmd, dx, dy, x1, y1, md5sum, timeout = words[:7]

@@ -69,7 +69,7 @@ def barrier_2(vm, words, fail_if_stuck_for, stuck_detection_history, output_dir,
         # Request screendump
         (status, output) = vm.send_monitor_cmd("screendump %s" % scrdump_filename)
         if status:
-            kvm_log.error("Could not fetch screendump")
+            logging.error("Could not fetch screendump")
             continue
 
         # Make sure image is valid

@@ -108,7 +108,7 @@ def barrier_2(vm, words, fail_if_stuck_for, stuck_detection_history, output_dir,
 
     # What should we do with this failure?
     if words[-1] == "optional":
-        kvm_log.info(message)
+        logging.info(message)
         return False
     else:
         # Collect information and put it in output_dir

@@ -126,7 +126,7 @@ def barrier_2(vm, words, fail_if_stuck_for, stuck_detection_history, output_dir,
                 ppm_utils.image_write_to_ppm_file(comparison_filename, w, h, data)
         # Print error messages and fail the test
         long_message = message + "\n(see analysis at %s)" % output_dir
-        kvm_log.error(long_message)
+        logging.error(long_message)
         raise error.TestFail, message
 
 

@@ -171,7 +171,7 @@ def run_steps(test, params, env):
         line = line.strip()
         if not line:
             continue
-        kvm_log.info(line)
+        logging.info(line)
 
         if line.startswith("#"):
             continue

@@ -191,7 +191,7 @@ def run_steps(test, params, env):
             vm.send_key(words[1])
         elif words[0] == "var":
             if not handle_var(vm, params, words[1]):
-                kvm_log.error("Variable not defined: %s" % words[1])
+                logging.error("Variable not defined: %s" % words[1])
         elif words[0] == "barrier_2":
             if current_screendump:
                 scrdump_filename = os.path.join(ppm_utils.get_data_dir(steps_filename), current_screendump)

190 lines not on this page · raw message

154 lines not on this page · raw message

index fda7282..5371d4b 100644
@@ -42,7 +42,7 @@ class kvm_runtest_2(test.test):
         sys.path.append(self.bindir)
 
     def run_once(self, params):
-        import kvm_log
+        import logging
         import kvm_utils
         import kvm_preprocessing
 

@@ -53,20 +53,20 @@ class kvm_runtest_2(test.test):
         resource.setrlimit(resource.RLIMIT_CORE, (-1, -1))
 
         # Set the logging prefix
-        kvm_log.set_prefix(params.get("shortname"))
+        #kvm_log.set_prefix(params.get("shortname"))
 
         # Report the parameters we've received and write them as keyvals
-        kvm_log.debug("Test parameters:")
+        logging.debug("Test parameters:")
         keys = params.keys()
         keys.sort()
         for key in keys:
-            kvm_log.debug("    %s = %s" % (key, params[key]))
+            logging.debug("    %s = %s" % (key, params[key]))
             self.write_test_keyval({key: params[key]})
 
         # Open the environment file
         env_filename = os.path.join(self.bindir, "env")
         env = shelve.open(env_filename, writeback=True)
-        kvm_log.debug("Contents of environment: %s" % str(env))
+        logging.debug("Contents of environment: %s" % str(env))
 
         try:
             try:

@@ -76,7 +76,7 @@ class kvm_runtest_2(test.test):
                 # If type could not be found in self.test_routines...
                 if not routine_obj:
                     message = "Unsupported test type: %s" % type
-                    kvm_log.error(message)
+                    logging.error(message)
                     raise error.TestError, message
                 # If we don't have the test routine yet...
                 if not routine_obj.routine:

@@ -93,8 +93,8 @@ class kvm_runtest_2(test.test):
                 env.sync()
 
             except Exception, e:
-                kvm_log.error("Test failed: %s" % e)
-                kvm_log.debug("Postprocessing on error...")
+                logging.error("Test failed: %s" % e)
+                logging.debug("Postprocessing on error...")
                 kvm_preprocessing.postprocess_on_error(self, params, env)
                 env.sync()
                 raise

@@ -102,7 +102,7 @@ class kvm_runtest_2(test.test):
         finally:
             # Postprocess
             kvm_preprocessing.postprocess(self, params, env)
-            kvm_log.debug("Contents of environment: %s" % str(env))
+            logging.debug("Contents of environment: %s" % str(env))
             env.sync()
             env.close()
 

299 lines not on this page · raw message

214 lines not on this page · raw message

index 54a1a4a..c07c125 100644
@@ -15,7 +15,7 @@ import commands
 from autotest_lib.client.common_lib import error
 
 import kvm_utils
-import kvm_log
+import logging
 import ppm_utils
 import stepeditor
 

@@ -136,7 +136,7 @@ class StepMaker(stepeditor.StepMakerWindow):
 
         (status, output) = self.vm.send_monitor_cmd("screendump " + self.screendump_filename)
         if status: # Failure
-            kvm_log.info("Could not fetch screendump")
+            logging.info("Could not fetch screendump")
         else:
             self.set_image_from_file(self.screendump_filename)
 

@@ -281,7 +281,7 @@ class StepMaker(stepeditor.StepMakerWindow):
 
         (status, output) = self.vm.send_monitor_cmd("screendump " + self.screendump_filename)
         if status: # Failure
-            kvm_log.info("Could not fetch screendump")
+            logging.info("Could not fetch screendump")
         else:
             self.set_image_from_file(self.screendump_filename)
 

index 46de723..bd96473 100644
@@ -1,16 +1,8 @@
 #!/usr/bin/python
 
-import os
-import time
-import md5
-import re
-import shutil
-
+import os, time, md5, re, shutil, logging
 from autotest_lib.client.common_lib import utils, error
-
-import kvm_utils
-import logging
-import ppm_utils
+import kvm_utils, ppm_utils
 
 
 def handle_var(vm, params, varname):

index 1b3bb47..a879271 100755
@@ -1,18 +1,9 @@
-import time
-import os
-import sys
-import urllib
-import re
-import signal
+import time, os, sys, urllib, re, signal, logging
 from datetime import *
-
 from autotest_lib.client.bin import utils, test
 from autotest_lib.client.common_lib import error
-
-import logging
 import kvm_utils
 
-
 def run_kvm_install(test, params, env):
     install_mode = params.get("mode")
     logging.info("Selected installation mode: %s" % install_mode)

index 5371d4b..479144c 100644
@@ -1,12 +1,6 @@
 #!/usr/bin/python
 
-import sys
-import os
-import time
-import shelve
-import random
-import resource
-
+import sys, os, time, shelve, random, resource, logging
 from autotest_lib.client.bin import test
 from autotest_lib.client.common_lib import error
 

index 90a87db..5d0f43e 100644
@@ -1,12 +1,6 @@
-import time
-import os
-
+import time, os, logging
 from autotest_lib.client.common_lib import utils, error
-
-import logging
-import kvm_utils
-import ppm_utils
-import scan_results
+import kvm_utils, ppm_utils, scan_results
 
 
 def run_boot(test, params, env):

index be8ad95..7a6e014 100644
@@ -1,18 +1,7 @@
 #!/usr/bin/python
 
-import md5
-import thread
-import subprocess
-import time
-import string
-import random
-import socket
-import os
-import signal
-import pty
-import select
-import re
-
+import md5, thread, subprocess, time, string, random, socket, os, signal, pty
+import select, re
 import kvm_log
 
 

index d0bd39f..ca11252 100644
@@ -1,11 +1,7 @@
 #!/usr/bin/python
 
-import time
-import socket
-import os
-
+import time, socket, os, logging
 import kvm_utils
-import logging
 
 
 def get_image_filename(params, image_dir):

index 002062c..b52f636 100755
@@ -4,13 +4,7 @@
 # Copyright (c)2005-2007 Matt Kruse (javascripttoolbox.com)
 # Copyright 2008-2009 Red Hat
 
-
-import os, sys
-import re
-import getopt
-import time
-import datetime
-import commands
+import os, sys, re, getopt, time, datetime, commands
 
 format_css="""
 html,body {

index 09b83e9..08d89cd 100644
@@ -1,11 +1,6 @@
 #!/usr/bin/python
 
-import md5
-import os
-import struct
-import time
-import re
-
+import md5, os, struct, time, re
 
 # Some directory/filename utils, for consistency
 

index de9a2b1..fc04df3 100755
@@ -4,15 +4,9 @@
 # Written by Michael Goldish
 version = "20090401"
 
-import pygtk
-pygtk.require('2.0')
-import gtk
-import os
-import glob
-import shutil
-import sys
-
+import pygtk, gtk, os, glob, shutil, sys
 import ppm_utils
+pygtk.require('2.0')
 
 
 # General utilities

index dc839d7..a233f7c 100644
@@ -1,10 +1,6 @@
 #!/usr/bin/python
 
-import sys
-import os
-import time
-import commands
-import re
+import sys, os, time, commands, re
 
 from autotest_lib.client.bin import test
 from autotest_lib.client.common_lib import error

180 lines not on this page · raw message

index bd96473..85434a3 100644
@@ -125,16 +125,16 @@ def barrier_2(vm, words, fail_if_stuck_for, stuck_detection_history, output_dir,
 def run_steps(test, params, env):
     vm = kvm_utils.env_get_vm(env, params.get("main_vm"))
     if not vm:
-        raise error.TestError, "VM object not found in environment"
+        raise error.TestError("VM object not found in environment")
     if not vm.is_alive():
-        raise error.TestError, "VM seems to be dead; Guestwizard requires a living VM"
+        raise error.TestError("VM seems to be dead; Guestwizard requires a living VM")
 
     steps_filename = params.get("steps")
     if not steps_filename:
-        raise error.TestError, "Steps filename not specified"
+        raise error.TestError("Steps filename not specified")
     steps_filename = os.path.join(test.bindir, "steps", steps_filename)
     if not os.path.exists(steps_filename):
-        raise error.TestError, "Steps file not found: %s" % steps_filename
+        raise error.TestError("Steps file not found: %s" % steps_filename)
 
     fail_if_stuck_for = params.get("fail_if_stuck_for")
     if fail_if_stuck_for:

index a879271..dbf8401 100755
@@ -27,11 +27,11 @@ def run_kvm_install(test, params, env):
         if not repo:
             message = "KVM git repository path not specified"
             logging.error(message)
-            raise error.TestError, message
+            raise error.TestError(message)
         if not user_repo:
             message = "KVM user git repository path not specified"
             logging.error(message)
-            raise error.TestError, message
+            raise error.TestError(message)
         __install_kvm_from_git(test, srcdir, repo, user_repo, branch, tag,
                                user_tag, lbranch)
 

@@ -42,7 +42,7 @@ def run_kvm_install(test, params, env):
         if not release_dir:
             message = "Release dir not specified"
             logging.error(message)
-            raise error.TestError, message
+            raise error.TestError(message)
         __install_kvm_release(test, srcdir, release_dir, release_tag)
 
     # install from snapshot

@@ -52,7 +52,7 @@ def run_kvm_install(test, params, env):
         if not snapshot_dir:
             message = "Snapshot dir not specified"
             logging.error(message)
-            raise error.TestError, message
+            raise error.TestError(message)
         __install_kvm_from_snapshot(test, srcdir, snapshot_dir, snapshot_date)
 
     # install from tarball

@@ -61,7 +61,7 @@ def run_kvm_install(test, params, env):
         if not tarball:
             message = "Local tarball filename not specified"
             logging.error(message)
-            raise error.TestError, message
+            raise error.TestError(message)
         __install_kvm_from_local_tarball(test, srcdir, tarball)
 
     # install from local sources

@@ -72,7 +72,7 @@ def run_kvm_install(test, params, env):
     else:
         message = "Invalid installation mode: '%s'" % install_mode
         logging.error(message)
-        raise error.TestError, message
+        raise error.TestError(message)
 
     # load kvm modules (unless requested not to)
     if params.get('load_modules', "yes") == "yes":

@@ -86,7 +86,7 @@ def __cleanup_dir(dir):
         if dirs or files:
             message = "Directory \'%s\' is not empty" % dir
             logging.error(message)
-            raise error.TestError, message
+            raise error.TestError(message)
 
 def __install_kvm_release(test, srcdir, release_dir, release_tag):
     if not release_tag:

@@ -199,7 +199,7 @@ def __load_kvm_modules():
     if utils.system("grep kvm /proc/modules 1>/dev/null", ignore_status=True) == 0:
         message = "Failed to remove old KVM modules"
         logging.error(message)
-        raise error.TestError, message
+        raise error.TestError(message)
 
     logging.info("Loading new KVM modules...")
     os.chdir("kernel")

@@ -215,7 +215,7 @@ def __load_kvm_modules():
     if utils.system("grep kvm_%s /proc/modules 1>/dev/null" %(vendor), ignore_status=True) != 0:
         message = "Failed to load KVM modules"
         logging.error(message)
-        raise error.TestError, message
+        raise error.TestError(message)
 
 def __install_kvm(test, srcdir):
     # create destination dir

index a233f7c..a3ffa72 100644
@@ -35,7 +35,7 @@ def preprocess_image(test, params):
         if not kvm_vm.create_image(params, qemu_img_path, image_dir):
             message = "Could not create image"
             logging.error(message)
-            raise error.TestError, message
+            raise error.TestError(message)
 
 
 def preprocess_vm(test, params, env, name):

@@ -84,7 +84,7 @@ def preprocess_vm(test, params, env, name):
         if not vm.create(name, params, qemu_path, image_dir, iso_dir, for_migration):
             message = "Could not start VM"
             logging.error(message)
-            raise error.TestError, message
+            raise error.TestError(message)
 
     scrdump_filename = os.path.join(test.debugdir, "pre_%s.ppm" % name)
     vm.send_monitor_cmd("screendump %s" % scrdump_filename)

index 479144c..297adc0 100644
@@ -71,7 +71,7 @@ class kvm_runtest_2(test.test):
                 if not routine_obj:
                     message = "Unsupported test type: %s" % type
                     logging.error(message)
-                    raise error.TestError, message
+                    raise error.TestError(message)
                 # If we don't have the test routine yet...
                 if not routine_obj.routine:
                     # Dynamically import the module

240 lines not on this page · raw message

index c07c125..8881ced 100644
@@ -323,16 +323,16 @@ class StepMaker(stepeditor.StepMakerWindow):
 def run_stepmaker(test, params, env):
     vm = kvm_utils.env_get_vm(env, params.get("main_vm"))
     if not vm:
-        raise error.TestError, "VM object not found in environment"
+        raise error.TestError("VM object not found in environment")
     if not vm.is_alive():
-        raise error.TestError, "VM seems to be dead; Step Maker requires a living VM"
+        raise error.TestError("VM seems to be dead; Step Maker requires a living VM")
 
     steps_filename = params.get("steps")
     if not steps_filename:
-        raise error.TestError, "Steps filename not specified"
+        raise error.TestError("Steps filename not specified")
     steps_filename = os.path.join(test.bindir, "steps", steps_filename)
     if os.path.exists(steps_filename):
-        raise error.TestError, "Steps file %s already exists" % steps_filename
+        raise error.TestError("Steps file %s already exists" % steps_filename)
 
     StepMaker(vm, steps_filename, test.debugdir, params)
     gtk.main()

index c848862..f113472 100644
@@ -1,8 +1,7 @@
 #!/usr/bin/python
 
 import md5, thread, subprocess, time, string, random, socket, os, signal, pty
-import select, re
-import kvm_log
+import select, re, logging
 
 
 # Functions for working with dicts obtained from the test config file

60 lines not on this page · raw message

index 87a30d5..1f40b42 100755
@@ -12,5 +12,3 @@ else:
     else:
         print kvm_utils.md5sum_file(fname, 1024*1024)
 
-
-

index a3ffa72..8ab258e 100644
@@ -1,13 +1,7 @@
-#!/usr/bin/python
-
-import sys, os, time, commands, re
-
+import sys, os, time, commands, re, logging
 from autotest_lib.client.bin import test
 from autotest_lib.client.common_lib import error
-
-import kvm_vm
-import kvm_utils
-import logging
+import kvm_vm, kvm_utils
 
 
 def preprocess_image(test, params):

index 297adc0..a3efc28 100644
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 import sys, os, time, shelve, random, resource, logging
 from autotest_lib.client.bin import test
 from autotest_lib.client.common_lib import error

@@ -46,8 +44,6 @@ class kvm_runtest_2(test.test):
         # Enable core dumps
         resource.setrlimit(resource.RLIMIT_CORE, (-1, -1))
 
-        # Set the logging prefix
-        #kvm_log.set_prefix(params.get("shortname"))
 
         # Report the parameters we've received and write them as keyvals
         logging.debug("Test parameters:")

index 8fc8f67..c1706a7 100644
@@ -299,9 +299,7 @@ def run_autotest(test, params, env):
         raise error.TestError(message_error)
 
 
-
 # I'm not sure if we need these...
-
 def internal_yum_update(session, command, prompt, timeout):
     session.sendline(command)
     end_time = time.time() + timeout

index f113472..32bb4d2 100644
@@ -1,11 +1,8 @@
-#!/usr/bin/python
-
 import md5, thread, subprocess, time, string, random, socket, os, signal, pty
 import select, re, logging
 
 
 # Functions for working with dicts obtained from the test config file
-
 def get_sub_dict(dict, name):
     """Return a "sub-dict" corresponding to a specific object.