Docserver: refactor Servlet, ObjectStore, and ServerInstance architecture to

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

Index: chrome/common/extensions/docs/server2/subversion_file_system_test.py
diff --git a/chrome/common/extensions/docs/server2/subversion_file_system_test.py b/chrome/common/extensions/docs/server2/subversion_file_system_test.py
index e490b057684758820f8d85e2fb5117fa95521d3a..8fd702fdd32ee7d36902a1cc958d05a64e720d2f 100755
--- a/chrome/common/extensions/docs/server2/subversion_file_system_test.py
+++ b/chrome/common/extensions/docs/server2/subversion_file_system_test.py
@@ -15,8 +15,10 @@ from subversion_file_system import SubversionFileSystem
 class SubversionFileSystemTest(unittest.TestCase):
   def setUp(self):
     self._base_path = os.path.join(sys.path[0], 'test_data', 'file_system')
+
+  def _CreateSubversionFileSystem(self):
     fetcher = FakeUrlFetcher(self._base_path)
-    self._file_system = SubversionFileSystem(fetcher, fetcher)
+    return SubversionFileSystem(fetcher, fetcher, self._base_path)
 
   def _ReadLocalFile(self, filename):
     with open(os.path.join(self._base_path, filename), 'r') as f:
@@ -28,19 +30,21 @@ class SubversionFileSystemTest(unittest.TestCase):
       'test2.txt': 'test2\n',
       'test3.txt': 'test3\n',
     }
+    file_system = self._CreateSubversionFileSystem()
     self.assertEqual(
         expected,
-        self._file_system.Read(['test1.txt', 'test2.txt', 'test3.txt']).Get())
+        file_system.Read(['test1.txt', 'test2.txt', 'test3.txt']).Get())
 
   def testListDir(self):
     expected = ['dir/']
     for i in range(7):
       expected.append('file%d.html' % i)
-    self.assertEqual(expected,
-                     sorted(self._file_system.ReadSingle('list/')))
+    file_system = self._CreateSubversionFileSystem()
+    self.assertEqual(expected, sorted(file_system.ReadSingle('list/')))
 
   def testDirStat(self):
-    stat_info = self._file_system.Stat('stat/')
+    file_system = self._CreateSubversionFileSystem()
+    stat_info =file_system.Stat('stat/')
     expected = StatInfo(
       '151113',
       child_versions=json.loads(self._ReadLocalFile('stat_result.json'))
@@ -48,7 +52,8 @@ class SubversionFileSystemTest(unittest.TestCase):
     self.assertEquals(expected, stat_info)
 
   def testFileStat(self):
-    stat_info = self._file_system.Stat('stat/extension_api.h')
+    file_system = self._CreateSubversionFileSystem()
+    stat_info = file_system.Stat('stat/extension_api.h')
     self.assertEquals(StatInfo('146163'), stat_info)
 
 if __name__ == '__main__':