Merge remote branch 'cros/upstream' into master

client/common_lib/test.py

 # Shell class for a test, inherited by all individual tests
 #
 # Methods:
 #       __init__        initialise
 #       initialize      run once for each job
 #       setup           run once for each new version of the test installed
 #       run             run the test (wrapped by job.run_test())
 #
 # Data:
 #       job             backreference to the job this test instance is part of
@@ skipping 53 matching lines @@
     def crash_handler_report(self):
         pass
 
 
     def assert_(self, expr, msg='Assertion failed.'):
         if not expr:
             raise error.TestError(msg)
 
 
     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):
         new_dict = {}
         for key, value in dictionary.iteritems():
             new_key = "%s{%s}" % (key, typename)
             new_dict[new_key] = value
         return new_dict
 
 
     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"), ""
 
 
     def analyze_perf_constraints(self, constraints):
         if not self._new_keyval:
             return
 
         # create a dict from the keyvals suitable as an environment for eval
@@ skipping 566 matching lines @@
         if before_iteration_hook:
             mytest.register_before_iteration_hook(before_iteration_hook)
         if after_iteration_hook:
             mytest.register_after_iteration_hook(after_iteration_hook)
         mytest._exec(args, dargs)
     finally:
         os.chdir(pwd)
         if after_test_hook:
             after_test_hook(mytest)
         shutil.rmtree(mytest.tmpdir, ignore_errors=True)