Docserver: Serve docs out of src/ not src/chrome/common/extensions. This allows

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

Index: chrome/common/extensions/docs/server2/app_yaml_helper_test.py
diff --git a/chrome/common/extensions/docs/server2/app_yaml_helper_test.py b/chrome/common/extensions/docs/server2/app_yaml_helper_test.py
index b53c0391f3c1d438a6400e00b75edc7309fedceb..94c7d5fd72f515466883d0c8dc613ef339904ae5 100755
--- a/chrome/common/extensions/docs/server2/app_yaml_helper_test.py
+++ b/chrome/common/extensions/docs/server2/app_yaml_helper_test.py
@@ -6,11 +6,12 @@
 import unittest
 
 from app_yaml_helper import AppYamlHelper
+from extensions_paths import SERVER2
 from file_system import FileNotFoundError
 from host_file_system_provider import HostFileSystemProvider
 from mock_file_system import MockFileSystem
 from object_store_creator import ObjectStoreCreator
-from test_file_system import TestFileSystem
+from test_file_system import MoveTo, TestFileSystem
 from test_util import DisableLogging
 
 _ExtractVersion, _IsGreater, _GenerateAppYaml = (
@@ -72,36 +73,34 @@ class AppYamlHelperTest(unittest.TestCase):
   @DisableLogging('warning')
   def testInstanceMethods(self):
     test_data = {
-      'server2': {
-        'app.yaml': _GenerateAppYaml('1-0'),
-        'app_yaml_helper.py': 'Copyright notice etc'
-      }
+      'app.yaml': _GenerateAppYaml('1-0'),
+      'app_yaml_helper.py': 'Copyright notice etc'
     }
 
     updates = []
     # Pass a specific file system at head to the HostFileSystemProvider so that
     # we know it's always going to be backed by a MockFileSystem. The Provider
     # may decide to wrap it in caching etc.
-    file_system_at_head = MockFileSystem(TestFileSystem(test_data))
+    file_system_at_head = MockFileSystem(
+        TestFileSystem(test_data, relative_to=SERVER2))
 
     def apply_update(update):
+      update = MoveTo(SERVER2, update)
       file_system_at_head.Update(update)
       updates.append(update)
 
     def host_file_system_constructor(branch, revision=None):
       self.assertEqual('trunk', branch)
       self.assertTrue(revision is not None)
-      return MockFileSystem.Create(TestFileSystem(test_data),
-                                   updates[:revision])
+      return MockFileSystem.Create(
+          TestFileSystem(test_data, relative_to=SERVER2), updates[:revision])
 
     object_store_creator = ObjectStoreCreator.ForTest()
     host_file_system_provider = HostFileSystemProvider(
         object_store_creator,
         default_trunk_instance=file_system_at_head,
         constructor_for_test=host_file_system_constructor)
-    helper = AppYamlHelper('server2/app.yaml',
-                           object_store_creator,
-                           host_file_system_provider)
+    helper = AppYamlHelper(object_store_creator, host_file_system_provider)
 
     def assert_is_up_to_date(version):
       self.assertTrue(helper.IsUpToDate(version),
@@ -114,9 +113,9 @@ class AppYamlHelperTest(unittest.TestCase):
     assert_is_up_to_date('1-5-0')
 
     # Revision 1.
-    apply_update({'server2': {
+    apply_update({
       'app.yaml': _GenerateAppYaml('1-5-0')
-    }})
+    })
 
     self.assertEqual(0, helper.GetFirstRevisionGreaterThan('0-5-0'))
     self.assertEqual(1, helper.GetFirstRevisionGreaterThan('1-0-0'))
@@ -124,9 +123,9 @@ class AppYamlHelperTest(unittest.TestCase):
     assert_is_up_to_date('2-5-0')
 
     # Revision 2.
-    apply_update({'server2': {
+    apply_update({
       'app_yaml_helper.py': 'fixed a bug'
-    }})
+    })
 
     self.assertEqual(0, helper.GetFirstRevisionGreaterThan('0-5-0'))
     self.assertEqual(1, helper.GetFirstRevisionGreaterThan('1-0-0'))
@@ -134,9 +133,9 @@ class AppYamlHelperTest(unittest.TestCase):
     assert_is_up_to_date('2-5-0')
 
     # Revision 3.
-    apply_update({'server2': {
+    apply_update({
       'app.yaml': _GenerateAppYaml('1-6-0')
-    }})
+    })
 
     self.assertEqual(0, helper.GetFirstRevisionGreaterThan('0-5-0'))
     self.assertEqual(1, helper.GetFirstRevisionGreaterThan('1-0-0'))
@@ -144,25 +143,25 @@ class AppYamlHelperTest(unittest.TestCase):
     assert_is_up_to_date('2-5-0')
 
     # Revision 4.
-    apply_update({'server2': {
+    apply_update({
       'app.yaml': _GenerateAppYaml('1-8-0')
-    }})
+    })
     # Revision 5.
-    apply_update({'server2': {
+    apply_update({
       'app.yaml': _GenerateAppYaml('2-0-0')
-    }})
+    })
     # Revision 6.
-    apply_update({'server2': {
+    apply_update({
       'app.yaml': _GenerateAppYaml('2-2-0')
-    }})
+    })
     # Revision 7.
-    apply_update({'server2': {
+    apply_update({
       'app.yaml': _GenerateAppYaml('2-4-0')
-    }})
+    })
     # Revision 8.
-    apply_update({'server2': {
+    apply_update({
       'app.yaml': _GenerateAppYaml('2-6-0')
-    }})
+    })
 
     self.assertEqual(0, helper.GetFirstRevisionGreaterThan('0-5-0'))
     self.assertEqual(1, helper.GetFirstRevisionGreaterThan('1-0-0'))