Clean up extreme verbosity of logs in test harness.

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 63 matching lines @@
 
     # Cache away options to instantiate workers later.
     cls.options = options
 
   def AttemptUpdateWithPayloadExpectedFailure(self, payload, expected_msg):
     """Attempt a payload update, expect it to fail with expected log"""
     try:
       self.worker.UpdateUsingPayload(payload)
     except UpdateException as err:
       # Will raise ValueError if expected is not found.
-      if re.search(re.escape(expected_msg), err.stdout, re.MULTILINE):
+      if re.search(re.escape(expected_msg), err.output, re.MULTILINE):
         return
       else:
         cros_lib.Warning("Didn't find '%s' in:" % expected_msg)
-        cros_lib.Warning(err.stdout)
+        cros_lib.Warning(err.output)
 
     self.fail('We managed to update when failure was expected')
 
   def AttemptUpdateWithFilter(self, filter, proxy_port=8081):
     """Update through a proxy, with a specified filter, and expect success."""
     self.worker.PrepareBase(self.target_image_path)
 
     # The devserver runs at port 8080 by default. We assume that here, and
     # start our proxy at a different one. We then tell our update tools to
     # have the client connect to our proxy_port instead of 8080.
     proxy = cros_test_proxy.CrosTestProxy(port_in=proxy_port,
                                           address_out='127.0.0.1',
                                           port_out=8080,
                                           filter=filter)
     proxy.serve_forever_in_thread()
     try:
       self.worker.PerformUpdate(self.target_image_path, self.target_image_path,
                                 proxy_port=proxy_port)
     finally:
       proxy.shutdown()
 
   # --- UNITTEST SPECIFIC METHODS ---
 
   def setUp(self):
     """Overrides unittest.TestCase.setUp and called before every test.
 
     Sets instance specific variables and initializes worker.
     """
-    unittest.TestCase.setUp(self)
+    super(AUTest, self).setUp()
     self.worker = self.worker_class(self.options, AUTest.test_results_root)
     self.download_folder = os.path.join(os.path.realpath(os.path.curdir),
                                         'latest_download')
     if not os.path.exists(self.download_folder):
       os.makedirs(self.download_folder)
 
   def tearDown(self):
     """Overrides unittest.TestCase.tearDown and called after every test."""
     self.worker.CleanUp()
 
@@ skipping 147 matching lines @@
     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)