This CL updates the parallel job library in the au test harness to be more robust.

au_test_harness/au_test.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 containing a test suite that is run to test auto updates."""
 
 import os
 import tempfile
 import time
 import unittest
@@ skipping 113 matching lines @@
   def tearDown(self):
     """Overrides unittest.TestCase.tearDown and called after every test."""
     self.worker.CleanUp()
 
   def testUpdateKeepStateful(self):
     """Tests if we can update normally.
 
     This test checks that we can update by updating the stateful partition
     rather than wiping it.
     """
-    self.worker.InitializeResultsDirectory()
+    self.worker.Initialize(9222)
+    # Just make sure some tests pass on original image.  Some old images
+    # don't pass many tests.
     self.worker.PrepareBase(self.base_image_path)
 
     # Update to
     self.worker.PerformUpdate(self.target_image_path, self.base_image_path)
     self.worker.VerifyImage(self)
 
     # Update from
     self.worker.PerformUpdate(self.target_image_path, self.target_image_path)
     self.worker.VerifyImage(self)
 
   def testUpdateWipeStateful(self):
     """Tests if we can update after cleaning the stateful partition.
 
     This test checks that we can update successfully after wiping the
     stateful partition.
     """
-    self.worker.InitializeResultsDirectory()
+    self.worker.Initialize(9223)
+    # Just make sure some tests pass on original image.  Some old images
+    # don't pass many tests.
     self.worker.PrepareBase(self.base_image_path)
 
     # Update to
     self.worker.PerformUpdate(self.target_image_path, self.base_image_path,
                               'clean')
     self.worker.VerifyImage(self)
 
     # Update from
     self.worker.PerformUpdate(self.target_image_path, self.target_image_path,
                               'clean')
@@ skipping 24 matching lines @@
            outbound will be closed.
         """
         if self.close_count < 3:
           if self.data_size > (2 * 1024 * 1024):
             self.close_count += 1
             return None
 
         self.data_size += len(data)
         return data
 
-    self.worker.InitializeResultsDirectory()
+    self.worker.Initialize(9224)
     self.AttemptUpdateWithFilter(InterruptionFilter(), proxy_port=8082)
 
   def testDelayedUpdate(self):
     """Tests what happens if some data is delayed during update delivery"""
 
     class DelayedFilter(cros_test_proxy.Filter):
       """Causes intermittent delays in data transmission.
 
          It does this by inserting 3 20 second delays when transmitting
          data after 2M has been sent.
@@ skipping 10 matching lines @@
            are delayed by 20 seconds.
         """
         if self.delay_count < 3:
           if self.data_size > (2 * 1024 * 1024):
             self.delay_count += 1
             time.sleep(20)
 
         self.data_size += len(data)
         return data
 
-    self.worker.InitializeResultsDirectory()
+    self.worker.Initialize(9225)
     self.AttemptUpdateWithFilter(DelayedFilter(), proxy_port=8083)
 
   def SimpleTest(self):
     """A simple update that updates once from a base image to a target.
 
     We explicitly don't use test prefix so that isn't run by default.  Can be
     run using test_prefix option.
     """
-    self.worker.InitializeResultsDirectory()
+    self.worker.Initialize(9226)
     self.worker.PrepareBase(self.base_image_path)
     self.worker.PerformUpdate(self.target_image_path, self.base_image_path)
     self.worker.VerifyImage(self)
 
   # --- DISABLED TESTS ---
 
   # TODO(sosa): Get test to work with verbose.
   def NotestPartialUpdate(self):
     """Tests what happens if we attempt to update with a truncated payload."""
-    self.worker.InitializeResultsDirectory()
+    self.worker.Initialize(9227)
     # Preload with the version we are trying to test.
     self.worker.PrepareBase(self.target_image_path)
 
     # Image can be updated at:
     # ~chrome-eng/chromeos/localmirror/autest-images
     url = 'http://gsdview.appspot.com/chromeos-localmirror/' \
           'autest-images/truncated_image.gz'
     payload = os.path.join(self.download_folder, 'truncated_image.gz')
 
     # Read from the URL and write to the local file
     urllib.urlretrieve(url, payload)
 
     expected_msg = 'download_hash_data == update_check_response_hash failed'
     self.AttemptUpdateWithPayloadExpectedFailure(payload, expected_msg)
 
   # TODO(sosa): Get test to work with verbose.
   def NotestCorruptedUpdate(self):
     """Tests what happens if we attempt to update with a corrupted payload."""
-    self.worker.InitializeResultsDirectory()
+    self.worker.Initialize(9228)
     # Preload with the version we are trying to test.
     self.worker.PrepareBase(self.target_image_path)
 
     # Image can be updated at:
     # ~chrome-eng/chromeos/localmirror/autest-images
     url = 'http://gsdview.appspot.com/chromeos-localmirror/' \
           'autest-images/corrupted_image.gz'
     payload = os.path.join(self.download_folder, 'corrupted.gz')
 
     # Read from the URL and write to the local file
     urllib.urlretrieve(url, payload)
 
     # This update is expected to fail...
     expected_msg = 'zlib inflate() error:-3'
     self.AttemptUpdateWithPayloadExpectedFailure(payload, expected_msg)