Merge remote branch 'autotest-upstream/master' into autotest-merge

client/bin/harness_ABAT.py

 """The ABAT harness interface
 
 The interface as required for ABAT.
 """
 
 __author__ = """Copyright Andy Whitcroft 2006"""
 
 from autotest_lib.client.bin import utils
 import os, harness, time, re
 
@@ skipping 113 matching lines @@
            (expect continue following reboot)
         """
         self.__send("REBOOT")
 
 
     def run_complete(self):
         """A run within this job is completing (all done)"""
         self.__send("DONE")
 
 
-    def test_status_detail(self, code, subdir, operation, msg, tag):
+    def test_status_detail(self, code, subdir, operation, msg, tag,
+                           optional_fields):
         """A test within this job is completing (detail)"""
 
         # Send the first line with the status code as a STATUS message.
         lines = msg.split("\n")
         self.__send_status(code, subdir, operation, lines[0])
 
 
     def test_status(self, msg, tag):
         lines = msg.split("\n")
 
         # Send each line as a SUMMARY message.
         for line in lines:
             self.__send("SUMMARY :" + line)