swarming: delete named cache symlinks before workdir

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 contextlib
 import functools
 import json
 import logging
 import os
 import sys
 import tempfile
 import unittest
 
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(
     __file__.decode(sys.getfilesystemencoding()))))
@@ skipping 20 matching lines @@
 
 def write_content(filepath, content):
   with open(filepath, 'wb') as f:
     f.write(content)
 
 
 def json_dumps(data):
   return json.dumps(data, sort_keys=True, separators=(',', ':'))
 
 
+@contextlib.contextmanager
+def init_named_caches_stub(_run_dir):
+  yield
+
+
 class StorageFake(object):
   def __init__(self, files):
     self._files = files.copy()
     self.namespace = 'default-gzip'
     self.location = 'http://localhost:1'
 
   def __enter__(self, *_):
     return self
 
   def __exit__(self, *_):
@@ skipping 150 matching lines @@
     for i in ('make_tree_read_only', 'make_tree_files_read_only',
               'make_tree_deleteable', 'make_tree_writeable'):
       self.mock(file_path, i, functools.partial(add, i))
 
     ret = run_isolated.run_tha_test(
         command,
         isolated_hash,
         StorageFake(files),
         isolateserver.MemoryCache(),
         None,
-        lambda run_dir: None,
+        init_named_caches_stub,
         False,
         None,
         None,
         None,
         None,
         None,
         None,
         run_isolated.noop_install_packages,
         False)
     self.assertEqual(0, ret)
@@ skipping 349 matching lines @@
       server.add_content('default-store', isolated_data)
       store = isolateserver.get_storage(server.url, 'default-store')
 
       self.mock(sys, 'stdout', StringIO.StringIO())
       ret = run_isolated.run_tha_test(
           None,
           isolated_hash,
           store,
           isolateserver.MemoryCache(),
           None,
-          lambda run_dir: None,
+          init_named_caches_stub,
           False,
           None,
           None,
           None,
           None,
           None,
           None,
           run_isolated.noop_install_packages,
           False)
       self.assertEqual(0, ret)
@@ skipping 65 matching lines @@
       server.add_content('default-store', isolated_data)
       store = isolateserver.get_storage(server.url, 'default-store')
 
       self.mock(sys, 'stdout', StringIO.StringIO())
       ret = run_isolated.run_tha_test(
           None,
           isolated_hash,
           store,
           isolateserver.MemoryCache(),
           ['foo', 'foodir/foo2'],
-          lambda run_dir: None,
+          init_named_caches_stub,
           False,
           None,
           None,
           None,
           None,
           None,
           None,
           run_isolated.noop_install_packages,
           False)
       self.assertEqual(0, ret)
@@ skipping 152 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()