named caches: move instead of symlinking

client/tests/run_isolated_test.py

Index: client/tests/run_isolated_test.py
diff --git a/client/tests/run_isolated_test.py b/client/tests/run_isolated_test.py
index a58e1261721b8387ae6eeadfb469c68b11f4ec52..074a251dc3d28b5291eba90819947dca740f8f9e 100755
--- a/client/tests/run_isolated_test.py
+++ b/client/tests/run_isolated_test.py
@@ -71,6 +71,19 @@ def init_named_caches_stub(_run_dir):
   yield
 
 
+def put_to_named_cache(manager, cache_name, file_name, contents):
+  """Puts files into named cache."""
+  install_dir = tempfile.mkdtemp(prefix='run_isolated_test')
+  try:
+    caches = [(cache_name, 'cache')]
+    manager.install(install_dir, caches)
+    with open(os.path.join(install_dir, 'cache', file_name), 'wb') as f:
+      f.write(contents)
+    manager.uninstall(install_dir, caches)
+  finally:
+    file_path.rmtree(install_dir)
+
+
 class StorageFake(object):
   def __init__(self, files):
     self._files = files.copy()
@@ -534,11 +547,11 @@ class RunIsolatedTest(RunIsolatedTestBase):
     self.assertEqual(0, ret)
 
     for path, cache_name in [('foo', 'cache_foo'), ('bar', '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):
@@ -609,13 +622,9 @@ class RunIsolatedTest(RunIsolatedTestBase):
       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, 'first', '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, 'second', 'small', small)
 
     # Ensures the cache contain the expected data.
     actual = genTree(np)