swarming: do not leak cache dirs in tests

client/tests/run_isolated_test.py

 #!/usr/bin/env python
 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 # pylint: disable=R0201
 
 import StringIO
 import base64
 import functools
@@ skipping 304 matching lines @@
     self.assertEqual(1, ret)
     self.assertEqual(1, len(self.popen_calls))
     self.assertEqual(
         [([self.temp_join(u'invalid'), u'command'], {'detached': True})],
         self.popen_calls)
 
   def test_main_naked_without_isolated(self):
     self.mock_popen_with_oserr()
     cmd = [
       '--no-log',
+      '--cache', self.tempdir,
       '/bin/echo',
       'hello',
       'world',
     ]
     ret = run_isolated.main(cmd)
     self.assertEqual(1, ret)
     self.assertEqual(1, len(self.popen_calls))
     self.assertEqual(
         [([u'/bin/echo', u'hello', u'world'], {'detached': True})],
         self.popen_calls)
@@ skipping 16 matching lines @@
             },
             {
               'package_name': 'infra/data/y',
               'version': 'canary',
             },
           ]
         }))
       finally:
         os.close(packages_fd)
 
+      cipd_cache = os.path.join(self.tempdir, 'cipd_cache')
       cmd = [
         '--no-log',
+        '--cache', os.path.join(self.tempdir, 'cache'),
         '--cipd-package-list', packages_path,
         '--cipd-server', self.cipd_server.url,
+        '--cipd-cache', cipd_cache,
         'bin/echo${EXECUTABLE_SUFFIX}',
         'hello',
         'world',
       ]
       ret = run_isolated.main(cmd)
       self.assertEqual(0, ret)
 
       print self.popen_calls
       self.assertEqual(3, len(self.popen_calls))
 
       # Test cipd-ensure command for installing packages.
       for cipd_ensure_cmd, _ in self.popen_calls[0:2]:
         self.assertEqual(cipd_ensure_cmd[:2], [
-          os.path.abspath('cipd_cache/cipd' + cipd.EXECUTABLE_SUFFIX),
+          os.path.join(cipd_cache, 'cipd' + cipd.EXECUTABLE_SUFFIX),
           'ensure',
         ])
         cache_dir_index = cipd_ensure_cmd.index('-cache-dir')
         self.assertEqual(
             cipd_ensure_cmd[cache_dir_index+1],
-            os.path.abspath('cipd_cache/cipd_internal'))
+            os.path.join(cipd_cache, 'cipd_internal'))
 
       # Test cipd cache.
-      version_file = unicode(os.path.abspath(
-          'cipd_cache/versions/1481d0a0ceb16ea4672fed76a0710306eb9f3a33'))
+      version_file = unicode(os.path.join(
+          cipd_cache, 'versions', '1481d0a0ceb16ea4672fed76a0710306eb9f3a33'))
       self.assertTrue(fs.isfile(version_file))
       with open(version_file) as f:
         self.assertEqual(f.read(), 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
 
-      client_binary_file = unicode(os.path.abspath(
-          'cipd_cache/clients/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'))
+      client_binary_file = unicode(os.path.join(
+          cipd_cache, 'clients', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'))
       self.assertTrue(fs.isfile(client_binary_file))
 
       # Test echo call.
       echo_cmd, _ = self.popen_calls[2]
       self.assertTrue(echo_cmd[0].endswith(
           '/bin/echo' + cipd.EXECUTABLE_SUFFIX))
       self.assertEqual(echo_cmd[1:], ['hello', 'world'])
     finally:
       os.remove(packages_path)
 
@@ skipping 224 matching lines @@
     self.assertEqual(expected, actual)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
   unittest.main()