Merge autotest upstream from @5318 ~ @5336

client/virt/tests/iofuzz.py

 import logging, re, random
 from autotest_lib.client.common_lib import error
-import kvm_subprocess
+from autotest_lib.client.virt import aexpect
 
 
 def run_iofuzz(test, params, env):
     """
     KVM iofuzz test:
     1) Log into a guest
     2) Enumerate all IO port ranges through /proc/ioports
     3) On each port of the range:
         * Read it
         * Write 0 to it
@@ skipping 14 matching lines @@
         @param session: SSH session stablished to a VM
         @param port: Port where we'll write the data
         @param data: Integer value that will be written on the port. This
                 value will be converted to octal before its written.
         """
         logging.debug("outb(0x%x, 0x%x)", port, data)
         outb_cmd = ("echo -e '\\%s' | dd of=/dev/port seek=%d bs=1 count=1" %
                     (oct(data), port))
         try:
             session.cmd(outb_cmd)
-        except kvm_subprocess.ShellError, e:
+        except aexpect.ShellError, e:
             logging.debug(e)
 
 
     def inb(session, port):
         """
         Read from a given port.
 
         @param session: SSH session stablished to a VM
         @param port: Port where we'll read data
         """
         logging.debug("inb(0x%x)", port)
         inb_cmd = "dd if=/dev/port seek=%d of=/dev/null bs=1 count=1" % port
         try:
             session.cmd(inb_cmd)
-        except kvm_subprocess.ShellError, e:
+        except aexpect.ShellError, e:
             logging.debug(e)
 
 
     def fuzz(session, inst_list):
         """
         Executes a series of read/write/randwrite instructions.
 
         If the guest SSH session hangs, an attempt to relogin will be made.
         If it fails, the guest will be reset. If during the process the VM
         process abnormally ends, the test fails.
@@ skipping 63 matching lines @@
 
             # Write random values to random ports of the range
             for seq in range(fuzz_count * (end - beg + 1)):
                 inst.append(("write",
                              [r.randint(beg, end), r.randint(0,255)]))
 
             fuzz(session, inst)
 
     finally:
         session.close()