Merge remote branch 'autotest-upstream/master' into autotest-merge
Merged to autotest upstream @5317.
BUG=none
TEST=
1. utils/unittest_suite.py
2. utils/packager.py --all upload -r /tmp/pkgs
3. utils/compile_gwt_clients.py
enter_chroot
emerge-x86-generic autotest-*
emerge-arm-generic autotest-*
run_remote_test suite_Smoke
run_remote_test bvt
Review URL: http://codereview.chromium.org/6883035
Change-Id: I03240d8652ffdfde4d6c8fbf474e2fad7f3cda10
diff --git a/client/bin/harness_ABAT.py b/client/bin/harness_ABAT.py
index 4fdcf7b..2ee8694 100644
--- a/client/bin/harness_ABAT.py
+++ b/client/bin/harness_ABAT.py
@@ -131,7 +131,8 @@
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.
