luci-py/isolateserver.py: Add support for tar archives when downloading.

client/tests/run_isolated_smoke_test.py

 #!/usr/bin/env python
 # Copyright 2012 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.
 
 import json
 import logging
 import os
 import subprocess
 import sys
@@ skipping 49 matching lines @@
       import os, sys
       prefix = u'\\\\\\\\?\\\\' if sys.platform == 'win32' else u''
       path = os.path.join(os.getcwd().decode(
           sys.getfilesystemencoding()), 'a' * 200, 'b' * 200)
       with open(prefix + path, 'rb') as f:
         actual = f.read()
         if actual != 'File1\\n':
           print >> sys.stderr, 'Unexpected content: %s' % actual
           sys.exit(1)
       print('Success')""",
-  'archive': (
+  'ar_archive': (
       '!<arch>\n'
       '#1/5            '
       '1447140471  1000  1000  100640  '
       '12        '
       '\x60\n'
       'a/foo'
       'Content'
       'b               '
       '1447140471  1000  1000  100640  '
       '12        '
       '\x60\n'
       'More content'),
+  'tar_archive': open(os.path.join(ROOT_DIR, 'tests', 'archive.tar')).read(),
   'archive_files.py': """if True:
       import os, sys
       ROOT_DIR = os.path.dirname(os.path.abspath(
           __file__.decode(sys.getfilesystemencoding())))
       expected = ['a', 'archive_files.py', 'b']
       actual = sorted(os.listdir(ROOT_DIR))
       if expected != actual:
         print >> sys.stderr, 'Expected list doesn\\'t match:'
         print >> sys.stderr, '%s\\n%s' % (','.join(expected), ','.join(actual))
         sys.exit(1)
@@ skipping 52 matching lines @@
 
 CONTENTS['manifest2.isolated'] = json.dumps(
     {
       'files': {'file2.txt': file_meta('file2.txt')},
       'includes': [
         isolateserver_mock.hash_content(CONTENTS['manifest1.isolated']),
       ],
     })
 
 
-CONTENTS['archive.isolated'] = json.dumps(
+CONTENTS['ar_archive.isolated'] = json.dumps(
     {
       'command': ['python', 'archive_files.py'],
       'files': {
         'archive': {
-          'h': isolateserver_mock.hash_content(CONTENTS['archive']),
-          's': len(CONTENTS['archive']),
+          'h': isolateserver_mock.hash_content(CONTENTS['ar_archive']),
+          's': len(CONTENTS['ar_archive']),
           't': 'ar',
         },
         'archive_files.py': file_meta('archive_files.py'),
       },
     })
 
+CONTENTS['tar_archive.isolated'] = json.dumps(
+    {
+      'command': ['python', 'archive_files.py'],
+      'files': {
+        'archive': {
+          'h': isolateserver_mock.hash_content(CONTENTS['tar_archive']),
+          's': len(CONTENTS['tar_archive']),
+          't': 'tar',
+        },
+        'archive_files.py': file_meta('archive_files.py'),
+      },
+    })
+
 
 CONTENTS['max_path.isolated'] = json.dumps(
     {
       'command': ['python', 'max_path.py'],
       'files': {
         'a' * 200 + '/' + 'b' * 200: file_meta('file1.txt'),
         'max_path.py': file_meta('max_path.py'),
       },
     })
 
@@ skipping 204 matching lines @@
       self._store('repeated_files.py'),
       self._store('repeated_files.isolated'),
     ]
     out, err, returncode = self._run(self._cmd_args(isolated_hash))
     self.assertEqual('', err)
     self.assertEqual('Success\n', out)
     self.assertEqual(0, returncode)
     actual = list_files_tree(self.cache)
     self.assertEqual(sorted(expected), actual)
 
-  def test_archive(self):
+  def test_ar_archive(self):
     # Loads an .isolated that includes an ar archive.
-    isolated_hash = self._store('archive.isolated')
+    isolated_hash = self._store('ar_archive.isolated')
     expected = [
       'state.json',
       isolated_hash,
-      self._store('archive'),
+      self._store('ar_archive'),
       self._store('archive_files.py'),
     ]
     out, err, returncode = self._run(self._cmd_args(isolated_hash))
+    self.assertEqual('', err)
+    self.assertEqual('Success\n', out)
+    self.assertEqual(0, returncode)
+    actual = list_files_tree(self.cache)
+    self.assertEqual(sorted(expected), actual)
+
+  def test_tar_archive(self):
+    # Loads an .isolated that includes an ar archive.
+    isolated_hash = self._store('tar_archive.isolated')
+    expected = [
+      'state.json',
+      isolated_hash,
+      self._store('tar_archive'),
+      self._store('archive_files.py'),
+    ]
+    out, err, returncode = self._run(self._cmd_args(isolated_hash))
     self.assertEqual('', err)
     self.assertEqual('Success\n', out)
     self.assertEqual(0, returncode)
     actual = list_files_tree(self.cache)
     self.assertEqual(sorted(expected), actual)
 
   def _test_corruption_common(self, new_content):
     isolated_hash = self._store('file_with_size.isolated')
     file1_hash = self._store('file1.txt')
 
@@ skipping 46 matching lines @@
     cached_file_path = self._test_corruption_common(
         CONTENTS['file1.txt'][:-1] + ' ')
     # TODO(maruel): This corruption is NOT detected.
     # This needs to be fixed.
     self.assertNotEqual(CONTENTS['file1.txt'], read_content(cached_file_path))
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   test_utils.main()