Fix tree closer. Deal with none case for PFQ.

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 641 matching lines @@
     else:
       self._PrepareRealBase(image_path)
 
   def _UpdateImage(self, image_path, src_image_path='', stateful_change='old',
                    proxy_port=None, private_key_path=None):
     if self.au_type == 'vm' and src_image_path and self._first_update:
       src_image_path = self.vm_image_path
       self._first_update = False
 
     # Generate a value that combines delta with private key path.
-    val = '%s+%s' % (src_image_path, private_key_path)
+    val = src_image_path
+    if private_key_path: val = '%s+%s' % (val, private_key_path)
     if not self.delta_list.has_key(image_path):
       self.delta_list[image_path] = set([val])
     else:
       self.delta_list[image_path].add(val)
 
   def AttemptUpdateWithPayloadExpectedFailure(self, payload, expected_msg):
     pass
 
   def VerifyImage(self, percent_required_to_pass):
     pass
@@ skipping 190 matching lines @@
   test_result = unittest.TextTestRunner(verbosity=0).run(test_suite)
   if not test_result.wasSuccessful():
     raise UpdateException(1, 'Error finding updates to generate.')
 
   Info('The following delta updates are required.')
   update_ids = []
   jobs = []
   args = []
   for target, srcs in PregenerateAUDeltas.delta_list.items():
     for src_key in srcs:
-      (src, key) = src_key.split('+')
+      (src, _ , key) = src_key.partition('+')
       # TODO(sosa): Add private key as part of caching name once devserver can
       # handle it its own cache.
       update_id = _GenerateUpdateId(target=target, src=src, key=key)
       print >> sys.stderr, 'AU: %s' % update_id
       update_ids.append(update_id)
       jobs.append(_GenerateVMUpdate)
       args.append((target, src, key))
 
   raw_results = _RunParallelJobs(options.jobs, jobs, args, print_status=True)
   results = []
@@ skipping 183 matching lines @@
       # Can't run in parallel with only one remote device.
       test_suite = _PrepareTestSuite(parser, options, test_class)
       test_result = unittest.TextTestRunner(verbosity=2).run(test_suite)
       if not test_result.wasSuccessful(): Die('Test harness failed.')
   finally:
     my_server.Stop()
 
 
 if __name__ == '__main__':
   main()