gsutil: Parallel-safe, specify target, add clean.

tests/gsutil_test.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Test gsutil.py."""
 
 
 import __builtin__
 import base64
@@ skipping 126 matching lines @@
     with zipfile.ZipFile(tempzip, 'w') as zf:
       zf.writestr('gsutil/gsutil', fake_gsutil)
     with open(tempzip, 'rb') as f:
       self.fake.add_expectation(url, _returns=Buffer(f.read()))
     self.fake.add_expectation(
         [sys.executable, gsutil_bin, 'version'], stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT, _returns=1)
 
     # This should delete the old bin and rewrite it with 'Fake gsutil'
     self.assertRaises(
-        gsutil.InvalidGsutilError, gsutil.ensure_gsutil, version, self.tempdir)
-    self.assertTrue(os.path.isdir(os.path.join(self.tempdir, '.cache_dir')))
+        gsutil.InvalidGsutilError, gsutil.ensure_gsutil, version, self.tempdir,
+        False)
     self.assertTrue(os.path.exists(gsutil_bin))
     with open(gsutil_bin, 'r') as f:
       self.assertEquals(f.read(), fake_gsutil)
     self.assertEquals(self.fake.expectations, [])
 
   def test_ensure_gsutil_short(self):
     version = '4.2'
     gsutil_dir = os.path.join(self.tempdir, 'gsutil_%s' % version, 'gsutil')
     gsutil_bin = os.path.join(gsutil_dir, 'gsutil')
     os.makedirs(gsutil_dir)
 
     # Mock out call().
     self.fake.add_expectation(
         [sys.executable, gsutil_bin, 'version'],
         stdout=subprocess.PIPE, stderr=subprocess.STDOUT, _returns=0)
 
     with open(gsutil_bin, 'w') as f:
       f.write('Foobar')
     self.assertEquals(
-        gsutil.ensure_gsutil(version, self.tempdir), gsutil_bin)
+        gsutil.ensure_gsutil(version, self.tempdir, False), gsutil_bin)
 
 if __name__ == '__main__':
   unittest.main()