Merge remote branch 'cros/upstream' into master

tko/parsers/version_1.py

 import os, re, time
 
 from autotest_lib.tko import models, status_lib, utils as tko_utils
 from autotest_lib.tko.parsers import base, version_0
 
 
 class job(version_0.job):
     def exit_status(self):
         # find the .autoserv_execute path
         top_dir = tko_utils.find_toplevel_job_dir(self.dir)
@@ skipping 52 matching lines @@
         if typed_match:
             key, val_type, value = typed_match.groups()
         else:
             # old-fashioned untyped match, assume perf
             untyped_match = re.search("^([^=]*)=(.*)$", line)
             if untyped_match:
                 key, value = untyped_match.groups()
                 val_type = "perf"
 
         # parse the actual value into a dict
-        if val_type == "attr":
-            attr_dict[key] = value
-        elif val_type == "perf" and re.search("^\d+(\.\d+)?$", value):
-            perf_dict[key] = float(value)
-        else:
+        try:
+            if val_type == "attr":
+                attr_dict[key] = value
+            elif val_type == "perf":
+                perf_dict[key] = float(value)
+            else:
+                raise ValueError
+        except ValueError:
             msg = ("WARNING: line '%s' found in test "
                    "iteration keyval could not be parsed")
             msg %= line
             tko_utils.dprint(msg)
 
 
 class status_line(version_0.status_line):
     def __init__(self, indent, status, subdir, testname, reason,
                  optional_fields):
         # handle INFO fields
@@ skipping 302 matching lines @@
 
         # the job is finished, produce the final SERVER_JOB entry and exit
         final_job = test.parse_test(self.job, "----", "SERVER_JOB",
                                     self.job.exit_status(), running_job.reason,
                                     current_kernel,
                                     self.job.started_time,
                                     self.job.finished_time,
                                     running_job)
         new_tests.append(final_job)
         yield new_tests