Use different proxy ports, and log port conflicts. Hopefully works around

bin/cros_au_test_harness.py

 #!/usr/bin/python
 
 # 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.
 
 """This module runs a suite of Auto Update tests.
 
   The tests can be run on either a virtual machine or actual device depending
   on parameters given.  Specific tests can be run by invoking --test_prefix.
@@ skipping 121 matching lines @@
       self._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):
         return
 
     Warning("Didn't find '%s' in:" % expected_msg)
     Warning(err.stdout)
     self.fail('We managed to update when failure was expected')
 
-  def AttemptUpdateWithFilter(self, filter):
+  def AttemptUpdateWithFilter(self, filter, proxy_port=8081):
     """Update through a proxy, with a specified filter, and expect success."""
 
     self.PrepareBase(self.target_image_path)
 
     # The devserver runs at port 8080 by default. We assume that here, and
-    # start our proxy at 8081. We then tell our update tools to have the
-    # client connect to 8081 instead of 8080.
-    proxy_port = 8081
+    # start our proxy at a different. 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()
 
     # This update is expected to fail...
     try:
       self.PerformUpdate(self.target_image_path, self.base_image_path,
                          proxy_port=proxy_port)
@@ skipping 182 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.AttemptUpdateWithFilter(InterruptionFilter())
+    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.
       """
       def setup(self):
         """Called once at the start of each connection."""
         self.data_size = 0
         self.delay_count = 0
 
       def OutBound(self, data):
         """Called once per packet for outgoing data.
 
            The first three packets after we reach 2M transferred
            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.AttemptUpdateWithFilter(DelayedFilter())
+    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.PrepareBase(self.base_image_path)
     self.PerformUpdate(self.target_image_path, self.base_image_path)
     self.VerifyImage(100)
@@ skipping 255 matching lines @@
   test_loader.testMethodPrefix = options.test_prefix
   test_suite = test_loader.loadTestsFromTestCase(test_class)
   test_result = unittest.TextTestRunner(verbosity=2).run(test_suite)
 
   if not test_result.wasSuccessful():
     Die('Test harness was not successful')
 
 
 if __name__ == '__main__':
   main()