Cache/retrieve extracted CIPD packages in local isolate cache

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 410 matching lines @@
               subdir: [
                 {'package': pkg, 'instance_id': ver}
                 for pkg, ver in packages
               ]
               for subdir, packages in pins.iteritems()
             }
           }, json_out)
         return 0
 
     self.popen_mocks.append(fake_ensure)
+    self._fake_isolated_cache = {}
+    self.mock(cipd.CipdClient, '_ensure_from_isolate', self.fake_ensure_from_isolate)
+    self.mock(cipd.CipdClient, '_isolate_cipd', self.fake_isolate_cipd)
+
     cipd_cache = os.path.join(self.tempdir, 'cipd_cache')
+
     cmd = [
       '--no-log',
       '--cache', os.path.join(self.tempdir, 'cache'),
       '--cipd-client-version', 'git:wowza',
       '--cipd-package', 'bin:infra/tools/echo/${platform}:latest',
       '--cipd-package', '.:infra/data/x:latest',
       '--cipd-package', '.:infra/data/y:canary',
       '--cipd-server', self.cipd_server.url,
       '--cipd-cache', cipd_cache,
       '--named-cache-root', os.path.join(self.tempdir, 'c'),
@@ skipping 29 matching lines @@
         cipd_cache, 'clients', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'))
     self.assertTrue(fs.isfile(client_binary_file))
 
     # Test echo call.
     echo_cmd, _ = self.popen_calls[1]
     self.assertTrue(echo_cmd[0].endswith(
         os.path.sep + 'bin' + os.path.sep + 'echo' + cipd.EXECUTABLE_SUFFIX),
         echo_cmd[0])
     self.assertEqual(echo_cmd[1:], ['hello', 'world'])
 
+  def fake_ensure_from_isolate(self, target_dir, cipd_isolated, isolate_cache):
+    # Not seen first time, then seen all other times
+    if cipd_isolated not in self._fake_isolated_cache:
+      self._fake_isolated_cache[cipd_isolated] = True
+      return False
+    return True
+
+  def fake_isolate_cipd(self, root, pkgs, isolate_cache, cipd_cache):
+    pass
+
   def test_main_naked_with_cipd_client_no_packages(self):
     cipd_cache = os.path.join(self.tempdir, 'cipd_cache')
     cmd = [
       '--no-log',
       '--cache', os.path.join(self.tempdir, 'cache'),
       '--cipd-enabled',
       '--cipd-client-version', 'git:wowza',
       '--cipd-server', self.cipd_server.url,
       '--cipd-cache', cipd_cache,
       '--named-cache-root', os.path.join(self.tempdir, 'c'),
@@ skipping 494 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()