Merge remote branch 'cros/upstream' into tempbranch3

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 267 matching lines @@
                                                            started_time)
                     msg = "RUNNING: %s\nSubdir: %s\nTestname: %s\n%s"
                     msg %= (running_test.status, running_test.subdir,
                             running_test.testname, running_test.reason)
                     tko_utils.dprint(msg)
                     new_tests.append(running_test)
                 started_time_stack.append(started_time)
                 subdir_stack.append(line.subdir)
                 continue
             elif line.type == "INFO":
+                fields = line.optional_fields
                 # update the current kernel if one is defined in the info
-                if "kernel" in line.optional_fields:
+                if "kernel" in fields:
                     current_kernel = line.get_kernel()
+                # update the SERVER_JOB reason if one was logged for an abort
+                if "job_abort_reason" in fields:
+                    running_job.reason = fields["job_abort_reason"]
+                    new_tests.append(running_job)
                 continue
             elif line.type == "STATUS":
                 # update the stacks
                 if line.subdir and stack.size() > min_stack_size:
                     subdir_stack[-1] = line.subdir
                 # update the status, start and finished times
                 stack.update(line.status)
                 if status_lib.is_worse_than_or_equal_to(line.status,
                                                         current_status):
                     if line.reason:
@@ skipping 77 matching lines @@
                 if new_test.testname == ("boot.%d" % boot_count):
                     boot_count += 1
                 msg = "ADD: %s\nSubdir: %s\nTestname: %s\n%s"
                 msg %= (new_test.status, new_test.subdir,
                         new_test.testname, new_test.reason)
                 tko_utils.dprint(msg)
                 new_tests.append(new_test)
 
         # 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(), "",
+                                    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