Docserver: Fixes for GitilesFileSystem

chrome/common/extensions/docs/server2/gitiles_file_system_test.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import base64
 import json
 import unittest
 
 from extensions_paths import SERVER2
 from file_system import StatInfo
 from future import Future
 from gitiles_file_system import (_CreateStatInfo,
                                  _ParseGitilesJson,
                                  GitilesFileSystem)
+from path_util import IsDirectory
 from test_file_system import TestFileSystem
 from test_util import ReadFile
 
 
 _BASE_URL = ''
 _REAL_DATA_DIR = 'chrome/common/extensions/docs/templates/public/extensions/'
+_TEST_DATA = (SERVER2, 'test_data', 'gitiles_file_system', 'public_extensions')
 # GitilesFileSystem expects file content to be encoded in base64.
 _TEST_FS = {
   'test1.txt': base64.b64encode('test1'),
   'dir1': {
     'test2.txt': base64.b64encode('test2'),
     'dir2': {
       'test3.txt': base64.b64encode('test3')
     }
   }
 }
@@ skipping 15 matching lines @@
 
   def FetchAsync(self, url):
     def resolve():
       assert '?' in url
       if url == _BASE_URL + '?format=JSON':
         return _Response(json.dumps({'commit': 'a_commit'}))
       path, fmt = url.split('?')
       # Fetch urls are of the form <base_url>/<path>. We only want <path>.
       path = path.split('/', 1)[1]
       if path == _REAL_DATA_DIR:
-        return _Response(ReadFile(SERVER2, 'test_data', 'gitiles_file_system',
-            'public_extensions'))
+        return _Response(ReadFile(*_TEST_DATA))
       # ALWAYS skip not found here.
       content = self._fs.Read((path,),
                               skip_not_found=True).Get().get(path, None)
       if content is None:
         # GitilesFS expects a DownloadError if the file wasn't found.
         raise DownloadError
       # GitilesFS expects directory content as a JSON string.
       if 'JSON' in fmt:
         content = json.dumps({
-          'entries': [{'name': name} for name in content]
+          'entries': [{
+            # GitilesFS expects directory names to not have a trailing '/'.
+            'name': name.rstrip('/'),
+            'type': 'tree' if IsDirectory(name) else 'blob'
+          } for name in content]
         })
       return _Response(content)
     return Future(callback=resolve)
 
 
 class GitilesFileSystemTest(unittest.TestCase):
   def setUp(self):
     fetcher = _FakeGitilesFetcher(TestFileSystem(_TEST_FS))
-    self._gitiles_fs = GitilesFileSystem(fetcher, _BASE_URL, '', '')
+    self._gitiles_fs = GitilesFileSystem(fetcher, _BASE_URL, 'master', None)
 
   def testParseGitilesJson(self):
     test_json = '\n'.join([
       ')]}\'',
       json.dumps({'commit': 'blah'})
     ])
     self.assertEqual(_ParseGitilesJson(test_json), {'commit': 'blah'})
 
   def testCreateStatInfo(self):
     test_json = '\n'.join([
@@ skipping 49 matching lines @@
     f = self._gitiles_fs.Read(['fakefile'], skip_not_found=True)
     self.assertEqual(f.Get(), {})
 
   def testGetCommitID(self):
     self.assertEqual(self._gitiles_fs.GetCommitID().Get(), 'a_commit')
 
   def testStat(self):
     self.assertEqual(self._gitiles_fs.Stat(_REAL_DATA_DIR).version,
                      'ec21e736a3f00db2c0580e3cf71d91951656caec')
 
+  def testGetIdentity(self):
+    # Test that file systems at different commits still have the same identity.
+    other_gitiles_fs = GitilesFileSystem.Create(commit='abcdefghijklmnop')
+    self.assertEqual(self._gitiles_fs.GetIdentity(),
+                     other_gitiles_fs.GetIdentity())
+
+    yet_another_gitiles_fs = GitilesFileSystem.Create(branch='different')
+    self.assertNotEqual(self._gitiles_fs.GetIdentity(),
+                        yet_another_gitiles_fs.GetIdentity())
 
 if __name__ == '__main__':
   unittest.main()