Add ability to pass a base test root and create results dirs relative.

bin/au_test_harness/au_worker.py

 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Module that contains the interface for au_test_harness workers.
 
 An au test harnss worker is a class that contains the logic for performing
 and validating updates on a target.  This should be subclassed to handle
 various types of target.  Types of targets include VM's, real devices, etc.
 """
 
+import inspect
+import threading
 import os
 import sys
 
 import cros_build_lib as cros_lib
 
 import dev_server_wrapper
 import update_exception
 
 
 class AUWorker(object):
   """Interface for a worker that updates and verifies images."""
-
+  # Mapping between cached payloads to directory locations.
   update_cache = None
 
   # --- INTERFACE ---
 
-  def __init__(self, options):
+  def __init__(self, options, test_results_root):
     """Processes options for the specific-type of worker."""
     self.board = options.board
     self.private_key = options.private_key
+    self.test_results_root = test_results_root
     self.use_delta_updates = options.delta
     self.verbose = options.verbose
     self.vm_image_path = None
     if options.quick_test:
       self.verify_suite = 'build_RootFilesystemSize'
     else:
       self.verify_suite = 'suite_Smoke'
 
     # Set these up as they are used often.
     self.crosutils = os.path.join(os.path.dirname(__file__), '..', '..')
@@ skipping 176 matching lines @@
     """
     cros_lib.Info('Output from VerifyImage():')
     print >> sys.stderr, output
     sys.stderr.flush()
     percent_passed = self._ParseGenerateTestReportOutput(output)
     cros_lib.Info('Percent passed: %d vs. Percent required: %d' % (
         percent_passed, percent_required_to_pass))
     unittest.assertTrue(percent_passed >= percent_required_to_pass)
     return percent_passed
 
+  def InitializeResultsDirectory(self):
+    """Called by a test to initialize a results directory for this worker."""
+    # Use the name of the test.
+    test_name = inspect.stack()[1][3]
+    self.results_directory = os.path.join(self.test_results_root, test_name)
+    self.results_count = 0
+
+  def GetNextResultsPath(self, label):
+    """Returns a new results path based for this label.
+
+    Prefixes directory returned for worker with time called i.e. 1_label,
+    2_label, etc.
+    """
+    self.results_count += 1
+    return os.path.join(self.results_directory, '%s_%s' % (self.results_count,
+                                                           label))
+
   # --- PRIVATE HELPER FUNCTIONS ---
 
   def _ParseGenerateTestReportOutput(self, output):
     """Returns the percentage of tests that passed based on output."""
     percent_passed = 0
     lines = output.split('\n')
 
     for line in lines:
       if line.startswith("Total PASS:"):
         # FORMAT: ^TOTAL PASS: num_passed/num_total (percent%)$
         percent_passed = line.split()[3].strip('()%')
         cros_lib.Info('Percent of tests passed %s' % percent_passed)
         break
 
     return int(percent_passed)