luci-py/isolateserver.py: Add archive support when downloading.

client/tests/isolateserver_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=W0212,W0223,W0231,W0613
 
 import base64
 import collections
 import hashlib
@@ skipping 706 matching lines @@
       queue.add(item.digest)
 
     # Wait for fetch to complete.
     while pending:
       fetched = queue.wait(pending)
       pending.discard(fetched)
 
     # Ensure fetched same data as was pushed.
     self.assertEqual(
         [i.buffer for i in items],
-        [cache.read(i.digest) for i in items])
+        [cache.getfileobj(i.digest).read() for i in items])
 
   def test_push_and_fetch(self):
     self.run_push_and_fetch_test('default')
 
   def test_push_and_fetch_gzip(self):
     self.run_push_and_fetch_test('default-gzip')
 
   if sys.maxsize == (2**31) - 1:
     def test_archive_multiple_huge_file(self):
       self.server.discard_content()
@@ skipping 96 matching lines @@
     self.assertEqual(0, isolateserver.main(cmd))
     expected = {
       os.path.join(net_utils.ROOT_DIR, 'path/to/a'): 'Coucou',
       os.path.join(net_utils.ROOT_DIR, 'path/to/b'): 'Bye Bye',
     }
     self.assertEqual(expected, actual)
 
   def test_download_isolated(self):
     # Test downloading an isolated tree.
     actual = {}
-    def file_write_mock(key, generator):
-      actual[key] = ''.join(generator)
-    self.mock(isolateserver, 'file_write', file_write_mock)
+    def putfile_mock(srcfileobj, dstpath, file_mode=None):
+      actual[dstpath] = srcfileobj.read()
+    self.mock(isolateserver, 'putfile', putfile_mock)
     self.mock(os, 'makedirs', lambda _: None)
     server = 'http://example.com'
     files = {
       os.path.join('a', 'foo'): 'Content',
       'b': 'More content',
       }
     isolated = {
       'command': ['Absurb', 'command'],
       'relative_cwd': 'a',
       'files': dict(
@@ skipping 224 matching lines @@
 
 
 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.CRITICAL))
   clear_env_vars()
   unittest.main()