Docserver: achieve online vs offline (cron vs instance) behaviour at the object

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

Index: chrome/common/extensions/docs/server2/caching_file_system_test.py
diff --git a/chrome/common/extensions/docs/server2/caching_file_system_test.py b/chrome/common/extensions/docs/server2/caching_file_system_test.py
index 9eee8161076551be90a9df7ad3b693dd7b720fd2..b011037f3f45332696ffecd85921ab080f539371 100755
--- a/chrome/common/extensions/docs/server2/caching_file_system_test.py
+++ b/chrome/common/extensions/docs/server2/caching_file_system_test.py
@@ -25,7 +25,7 @@ class CachingFileSystemTest(unittest.TestCase):
     # the underlying object store data is the same, within each test.
     self._object_store_dbs = {}
 
-  def _CreateCachingFileSystem(self, fs, use_existing_values=False):
+  def _CreateCachingFileSystem(self, fs, start_configuration):
     def object_store_constructor(namespace, start_empty=False):
       if namespace not in self._object_store_dbs:
         self._object_store_dbs[namespace] = {}
@@ -35,12 +35,14 @@ class CachingFileSystemTest(unittest.TestCase):
       return TestObjectStore(namespace, init=db)
     return CachingFileSystem(
         fs,
-        ObjectStoreCreator.TestFactory(store_type=object_store_constructor),
-        use_existing_values=use_existing_values)
+        ObjectStoreCreator.TestFactory(
+            store_type=object_store_constructor,
+            start_configuration=start_configuration))
 
   def testReadFiles(self):
-    file_system = CachingFileSystem(_CreateLocalFs(),
-                                    ObjectStoreCreator.TestFactory())
+    file_system = self._CreateCachingFileSystem(
+        _CreateLocalFs(),
+        ObjectStoreCreator.START_POPULATED)
     expected = {
       './test1.txt': 'test1\n',
       './test2.txt': 'test2\n',
@@ -51,8 +53,9 @@ class CachingFileSystemTest(unittest.TestCase):
         file_system.Read(['./test1.txt', './test2.txt', './test3.txt']).Get())
 
   def testListDir(self):
-    file_system = CachingFileSystem(_CreateLocalFs(),
-                                    ObjectStoreCreator.TestFactory())
+    file_system = self._CreateCachingFileSystem(
+        _CreateLocalFs(),
+        ObjectStoreCreator.START_POPULATED)
     expected = ['dir/'] + ['file%d.html' % i for i in range(7)]
     file_system._read_object_store.Set(
         'list/',
@@ -74,7 +77,10 @@ class CachingFileSystemTest(unittest.TestCase):
         'bob3': 'bob/bob3 contents',
       }
     })
-    file_system = self._CreateCachingFileSystem(fake_fs)
+    def create_empty_caching_fs():
+      return self._CreateCachingFileSystem(fake_fs,
+                                           ObjectStoreCreator.START_EMPTY)
+    file_system = create_empty_caching_fs()
 
     self.assertEqual('bob/bob0 contents', file_system.ReadSingle('bob/bob0'))
     self.assertTrue(*fake_fs.CheckAndReset(read_count=1, stat_count=1))
@@ -84,18 +90,18 @@ class CachingFileSystemTest(unittest.TestCase):
     self.assertTrue(*fake_fs.CheckAndReset())
 
     # Test if the Stat version is the same the resource is not re-fetched.
-    file_system = self._CreateCachingFileSystem(fake_fs)
+    file_system = create_empty_caching_fs()
     self.assertEqual('bob/bob0 contents', file_system.ReadSingle('bob/bob0'))
     self.assertTrue(*fake_fs.CheckAndReset(stat_count=1))
 
     # Test if there is a newer version, the resource is re-fetched.
-    file_system = self._CreateCachingFileSystem(fake_fs)
+    file_system = create_empty_caching_fs()
     fake_fs.IncrementStat();
     self.assertEqual('bob/bob0 contents', file_system.ReadSingle('bob/bob0'))
     self.assertTrue(*fake_fs.CheckAndReset(read_count=1, stat_count=1))
 
     # Test directory and subdirectory stats are cached.
-    file_system = self._CreateCachingFileSystem(fake_fs)
+    file_system = create_empty_caching_fs()
     file_system._stat_object_store.Del('bob/bob0')
     file_system._read_object_store.Del('bob/bob0')
     file_system._stat_object_store.Del('bob/bob1')
@@ -107,7 +113,7 @@ class CachingFileSystemTest(unittest.TestCase):
     self.assertTrue(*fake_fs.CheckAndReset())
 
     # Test a more recent parent directory doesn't force a refetch of children.
-    file_system = self._CreateCachingFileSystem(fake_fs)
+    file_system = create_empty_caching_fs()
     file_system._read_object_store.Del('bob/bob0')
     file_system._read_object_store.Del('bob/bob1')
     self.assertEqual('bob/bob1 contents', file_system.ReadSingle('bob/bob1'))
@@ -116,13 +122,13 @@ class CachingFileSystemTest(unittest.TestCase):
     self.assertTrue(*fake_fs.CheckAndReset(read_count=3, stat_count=1))
 
     fake_fs.IncrementStat(path='bob/')
-    file_system = self._CreateCachingFileSystem(fake_fs)
+    file_system = create_empty_caching_fs()
     self.assertEqual('bob/bob1 contents', file_system.ReadSingle('bob/bob1'))
     self.assertEqual('bob/bob2 contents', file_system.ReadSingle('bob/bob2'))
     self.assertEqual('bob/bob3 contents', file_system.ReadSingle('bob/bob3'))
     self.assertTrue(*fake_fs.CheckAndReset(stat_count=1))
 
-    file_system = self._CreateCachingFileSystem(fake_fs)
+    file_system = create_empty_caching_fs()
     file_system._stat_object_store.Del('bob/bob0')
     self.assertEqual('bob/bob0 contents', file_system.ReadSingle('bob/bob0'))
     self.assertTrue(*fake_fs.CheckAndReset(read_count=1, stat_count=1))
@@ -136,9 +142,9 @@ class CachingFileSystemTest(unittest.TestCase):
         'bob1': 'bob/bob1 contents'
       }
     })
-    file_system = self._CreateCachingFileSystem(fake_fs,
-                                                use_existing_values=True)
-
+    file_system = self._CreateCachingFileSystem(
+        fake_fs,
+        ObjectStoreCreator.START_POPULATED)
     self.assertEqual(StatInfo('0'), file_system.Stat('bob/bob0'))
     self.assertTrue(*fake_fs.CheckAndReset(stat_count=1))
     self.assertEqual(StatInfo('0'), file_system.Stat('bob/bob0'))
@@ -172,7 +178,9 @@ class CachingFileSystemTest(unittest.TestCase):
 
     def run_expecting_stat(stat):
       def run():
-        file_system = self._CreateCachingFileSystem(fake_fs)
+        file_system = self._CreateCachingFileSystem(
+            fake_fs,
+            ObjectStoreCreator.START_EMPTY)
         self.assertEqual(
             StatInfo(stat, child_versions={'bob0': stat, 'bob1': stat}),
             file_system.Stat('bob/'))