Docserver: Pull knowledge of host file systems into a single

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

 #!/usr/bin/env python
 # Copyright 2013 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 unittest
 
 from appengine_wrappers import GetAppVersion
 from app_yaml_helper import AppYamlHelper
 from cron_servlet import CronServlet
 from empty_dir_file_system import EmptyDirFileSystem
-from host_file_system_creator import HostFileSystemCreator
+from host_file_system_provider import HostFileSystemProvider
 from local_file_system import LocalFileSystem
 from mock_file_system import MockFileSystem
 from servlet import Request
 from test_branch_utility import TestBranchUtility
 from test_file_system import TestFileSystem
 from test_util import EnableLogging
 
 # NOTE(kalman): The ObjectStore created by the CronServlet is backed onto our
 # fake AppEngine memcache/datastore, so the tests aren't isolated. Of course,
 # if the host file systems have different identities, they will be, sort of.
 class _TestDelegate(CronServlet.Delegate):
   def __init__(self, create_file_system):
     self.file_systems = []
     # A callback taking a revision and returning a file system.
     self._create_file_system = create_file_system
     self._app_version = GetAppVersion()
 
   def CreateBranchUtility(self, object_store_creator):
     return TestBranchUtility.CreateWithCannedData()
 
-  def CreateHostFileSystemCreator(self, object_store_creator):
+  def CreateHostFileSystemProvider(self,
+                                  object_store_creator,
+                                  max_trunk_revision=None):
     def constructor(branch=None, revision=None):
       file_system = self._create_file_system(revision)
       self.file_systems.append(file_system)
       return file_system
-    return HostFileSystemCreator(object_store_creator,
+    return HostFileSystemProvider(object_store_creator,
+                                 max_trunk_revision=max_trunk_revision,
                                  constructor_for_test=constructor)
 
   def CreateAppSamplesFileSystem(self, object_store_creator):
     return EmptyDirFileSystem()
 
   def GetAppVersion(self):
     return self._app_version
 
   # (non-Delegate method).
   def SetAppVersion(self, app_version):
@@ skipping 165 matching lines @@
     CronServlet(Request.ForTest('trunk'), delegate_for_test=delegate).Get()
     self.assertEqual(AppYamlHelper.GenerateAppYaml('2-1-0'),
                      file_systems[-1].ReadSingle(app_yaml_path))
     self.assertEqual('y u not update!',
                      file_systems[-1].ReadSingle(storage_html_path))
     self.assertEqual('important content!',
                      file_systems[-1].ReadSingle(static_txt_path))
 
 if __name__ == '__main__':
   unittest.main()