named caches: move instead of symlinking

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
@@ skipping 53 matching lines @@
       with open(p, 'rb') as f:
         out[os.path.relpath(p, path)] = f.read()
   return out
 
 
 @contextlib.contextmanager
 def init_named_caches_stub(_run_dir):
   yield
 
 
+def put_to_named_cache(manager, cache_name, file_name, contents):
+  """Puts files into named cache."""
+  tdir = unicode(tempfile.mkdtemp(prefix='run_isolated_test'))

[M-A Ruel, 2017/05/10 18:48:01]

if you make the prefix unicode, the returned string will be unicode.

[nodir, 2017/05/10 19:15:35]

nice :) Done

+  try:
+    cache_dir = os.path.join(tdir, 'cache')
+    manager.install(cache_dir, cache_name)
+    with open(os.path.join(cache_dir, file_name), 'wb') as f:
+      f.write(contents)
+    manager.uninstall(cache_dir, cache_name)
+  finally:
+    file_path.rmtree(tdir)
+
+
 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 442 matching lines @@
       '--named-cache-root', os.path.join(self.tempdir, 'c'),
       '--named-cache', 'cache_foo', 'foo',
       '--named-cache', 'cache_bar', 'bar',
       'bin/echo${EXECUTABLE_SUFFIX}',
       'hello',
       'world',
     ]
     ret = run_isolated.main(cmd)
     self.assertEqual(0, ret)
 
-    for path, cache_name in [('foo', 'cache_foo'), ('bar', 'cache_bar')]:
+    for cache_name in ('cache_foo', 'cache_bar'):
+      named_path = os.path.join(self.tempdir, 'c', 'named', cache_name)
+      self.assertTrue(os.path.exists(named_path))
       self.assertEqual(
-          os.path.abspath(os.readlink(
-              os.path.join(self.tempdir, 'ir', path))),
-          os.path.abspath(os.readlink(
-              os.path.join(self.tempdir, 'c', 'named', cache_name))),
+          os.path.join(self.tempdir, 'c'),
+          os.path.dirname(os.readlink(named_path)),
       )
 
   def test_modified_cwd(self):
     isolated = json_dumps({
         'command': ['../out/some.exe', 'arg'],
         'relative_cwd': 'some',
     })
     isolated_hash = isolateserver_mock.hash_content(isolated)
     files = {isolated_hash:isolated}
     _ = self._run_tha_test(isolated_hash, files)
@@ skipping 50 matching lines @@
     big = small * 1014
     small_digest = unicode(ALGO(small).hexdigest())
     big_digest = unicode(ALGO(big).hexdigest())
     with isolate_cache:
       fake_time = 1
       isolate_cache.write(big_digest, [big])
       fake_time = 2
       isolate_cache.write(small_digest, [small])
     with named_cache_manager.open(time_fn=lambda: fake_time):
       fake_time = 1
-      p = named_cache_manager.request('first')
-      with open(os.path.join(p, 'big'), 'wb') as f:
-        f.write(big)
+      put_to_named_cache(named_cache_manager, u'first', u'big', big)
       fake_time = 3
-      p = named_cache_manager.request('second')
-      with open(os.path.join(p, 'small'), 'wb') as f:
-        f.write(small)
+      put_to_named_cache(named_cache_manager, u'second', u'small', small)
 
     # Ensures the cache contain the expected data.
     actual = genTree(np)
     # Figure out the cache path names.
     cache_small = [
         os.path.dirname(n) for n in actual if os.path.basename(n) == 'small'][0]
     cache_big = [
         os.path.dirname(n) for n in actual if os.path.basename(n) == 'big'][0]
     expected = {
       os.path.join(cache_small, u'small'): small,
@@ skipping 356 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()