Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

client/tests/kvm/scan_results.py

 #!/usr/bin/python
 """
 Program that parses the autotest results and return a nicely printed final test
 result.
 
 @copyright: Red Hat 2008-2009
 """
 
 def parse_results(text):
     """
@@ skipping 20 matching lines @@
         # Found an END line -- get end time, name and status
         elif (line.startswith("END") and len(parts) >= 5 and
               parts[3].startswith("timestamp")):
             end_time = float(parts[3].split("=")[1])
             start_time = start_time_list.pop()
             info = info_list.pop()
             test_name = parts[2]
             test_status = parts[0].split()[1]
             # Remove "kvm." prefix
             if test_name.startswith("kvm."):
-                test_name = test_name[4:]
+                test_name = test_name.split("kvm.")[1]
             result_list.append((test_name, test_status,
                                 int(end_time - start_time), info))
 
         # Found a FAIL/ERROR/GOOD line -- get failure/success info
         elif (len(parts) >= 6 and parts[3].startswith("timestamp") and
               parts[4].startswith("localtime")):
             info_list[-1] = parts[5]
 
     return result_list
 
@@ skipping 36 matching lines @@
 if __name__ == "__main__":
     import sys, os, glob
 
     resfiles = glob.glob("../../results/default/status*")
     if len(sys.argv) > 1:
         if sys.argv[1] == "-h" or sys.argv[1] == "--help":
             print "Usage: %s [result files]" % sys.argv[0]
             sys.exit(0)
         resfiles = sys.argv[1:]
     main(resfiles)