| Index: chrome/common/extensions/docs/server2/server_instance.py
|
| diff --git a/chrome/common/extensions/docs/server2/server_instance.py b/chrome/common/extensions/docs/server2/server_instance.py
|
| index 1456a45a871f12a251f8958adc7e23edb122b4da..80f8e4230149c179b1c912440abea88d83b5c26c 100644
|
| --- a/chrome/common/extensions/docs/server2/server_instance.py
|
| +++ b/chrome/common/extensions/docs/server2/server_instance.py
|
| @@ -3,7 +3,6 @@
|
| # found in the LICENSE file.
|
|
|
| from fnmatch import fnmatch
|
| -import logging
|
| import mimetypes
|
| import traceback
|
| import os
|
| @@ -12,6 +11,7 @@ from api_data_source import APIDataSource
|
| from api_list_data_source import APIListDataSource
|
| from appengine_url_fetcher import AppEngineUrlFetcher
|
| from appengine_wrappers import GetAppVersion, IsDevServer
|
| +from availability_finder import AvailabilityFinder
|
| from branch_utility import BranchUtility
|
| from caching_file_system import CachingFileSystem
|
| from compiled_file_system import CompiledFileSystem
|
| @@ -27,9 +27,10 @@ from path_canonicalizer import PathCanonicalizer
|
| from reference_resolver import ReferenceResolver
|
| from samples_data_source import SamplesDataSource
|
| from sidenav_data_source import SidenavDataSource
|
| -from subversion_file_system import SubversionFileSystem
|
| import svn_constants
|
| from template_data_source import TemplateDataSource
|
| +from test_branch_utility import TestBranchUtility
|
| +from test_file_system import TestFileSystem
|
| from test_object_store import TestObjectStore
|
| from third_party.json_schema_compiler.model import UnixName
|
| import url_constants
|
| @@ -41,7 +42,9 @@ class ServerInstance(object):
|
| host_file_system,
|
| app_samples_file_system,
|
| base_path,
|
| - compiled_fs_factory):
|
| + compiled_fs_factory,
|
| + branch_utility,
|
| + create_file_system):
|
| self.channel = channel
|
|
|
| self.object_store_creator = object_store_creator
|
| @@ -52,6 +55,12 @@ class ServerInstance(object):
|
|
|
| self.compiled_host_fs_factory = compiled_fs_factory
|
|
|
| + self.availability_finder_factory = AvailabilityFinder.Factory(
|
| + object_store_creator,
|
| + self.compiled_host_fs_factory,
|
| + branch_utility,
|
| + create_file_system)
|
| +
|
| self.api_list_data_source_factory = APIListDataSource.Factory(
|
| self.compiled_host_fs_factory,
|
| svn_constants.API_PATH,
|
| @@ -59,7 +68,8 @@ class ServerInstance(object):
|
|
|
| self.api_data_source_factory = APIDataSource.Factory(
|
| self.compiled_host_fs_factory,
|
| - svn_constants.API_PATH)
|
| + svn_constants.API_PATH,
|
| + self.availability_finder_factory)
|
|
|
| self.ref_resolver_factory = ReferenceResolver.Factory(
|
| self.api_data_source_factory,
|
| @@ -131,7 +141,9 @@ class ServerInstance(object):
|
| EmptyDirFileSystem(),
|
| '',
|
| CompiledFileSystem.Factory(file_system,
|
| - object_store_creator))
|
| + object_store_creator),
|
| + TestBranchUtility(),
|
| + lambda version: file_system)
|
|
|
| @staticmethod
|
| def ForLocal():
|
| @@ -139,12 +151,15 @@ class ServerInstance(object):
|
| object_store_creator = ObjectStoreCreator(channel,
|
| start_empty=False,
|
| store_type=TestObjectStore)
|
| - file_system = CachingFileSystem(LocalFileSystem.Create(),
|
| - object_store_creator)
|
| + def create_file_system(version):
|
| + return CachingFileSystem(LocalFileSystem.Create(), object_store_creator)
|
| + trunk_file_system = create_file_system('trunk')
|
| return ServerInstance(
|
| channel,
|
| object_store_creator,
|
| - file_system,
|
| + trunk_file_system,
|
| EmptyDirFileSystem(),
|
| '',
|
| - CompiledFileSystem.Factory(file_system, object_store_creator))
|
| + CompiledFileSystem.Factory(trunk_file_system, object_store_creator),
|
| + TestBranchUtility(),
|
| + create_file_system)
|
|
|