Merge remote branch 'cros/upstream' into master

client/common_lib/test.py

Index: client/common_lib/test.py
diff --git a/client/common_lib/test.py b/client/common_lib/test.py
index 766766b4902e181f2dcca5dbffe51f7071263ba9..310b45dc17695610dfedef52b7744e1e4262bf42 100644
--- a/client/common_lib/test.py
+++ b/client/common_lib/test.py
@@ -71,8 +71,8 @@ class base_test(object):
 
 
     def write_test_keyval(self, attr_dict):
-        utils.write_keyval(self.outputdir, attr_dict)
-
+        utils.write_keyval(self.outputdir, attr_dict,
+                           tap_report=self.job._tap)
 
     @staticmethod
     def _append_type_to_keys(dictionary, typename):
@@ -84,25 +84,29 @@ class base_test(object):
 
 
     def write_perf_keyval(self, perf_dict):
-        self.write_iteration_keyval({}, perf_dict)
+        self.write_iteration_keyval({}, perf_dict,
+                                    tap_report=self.job._tap)
 
 
     def write_attr_keyval(self, attr_dict):
-        self.write_iteration_keyval(attr_dict, {})
+        self.write_iteration_keyval(attr_dict, {},
+                                    tap_report=self.job._tap)
 
 
-    def write_iteration_keyval(self, attr_dict, perf_dict):
+    def write_iteration_keyval(self, attr_dict, perf_dict, tap_report=None):
         # append the dictionaries before they have the {perf} and {attr} added
         self._keyvals.append({'attr':attr_dict, 'perf':perf_dict})
         self._new_keyval = True
 
         if attr_dict:
             attr_dict = self._append_type_to_keys(attr_dict, "attr")
-            utils.write_keyval(self.resultsdir, attr_dict, type_tag="attr")
+            utils.write_keyval(self.resultsdir, attr_dict, type_tag="attr",
+                               tap_report=tap_report)
 
         if perf_dict:
             perf_dict = self._append_type_to_keys(perf_dict, "perf")
-            utils.write_keyval(self.resultsdir, perf_dict, type_tag="perf")
+            utils.write_keyval(self.resultsdir, perf_dict, type_tag="perf",
+                               tap_report=tap_report)
 
         keyval_path = os.path.join(self.resultsdir, "keyval")
         print >> open(keyval_path, "a"), ""