Index: chrome/common/extensions/docs/server2/cron_servlet_test.py |
diff --git a/chrome/common/extensions/docs/server2/cron_servlet_test.py b/chrome/common/extensions/docs/server2/cron_servlet_test.py |
index 1f532636f108179527963412d5b352ac9faa3695..915bd048adead2ca16b963c5b4f6cc7520673add 100755 |
--- a/chrome/common/extensions/docs/server2/cron_servlet_test.py |
+++ b/chrome/common/extensions/docs/server2/cron_servlet_test.py |
@@ -93,47 +93,64 @@ class CronServletTest(unittest.TestCase): |
@IgnoreMissingContentProviders |
def testSafeRevision(self): |
test_data = { |
- 'api': { |
- '_api_features.json': '{}', |
- '_manifest_features.json': '{}', |
- '_permission_features.json': '{}', |
+ 'extensions': { |
+ 'browser': { |
+ 'api': {} |
+ } |
}, |
- 'docs': { |
- 'examples': { |
- 'examples.txt': 'examples.txt contents' |
- }, |
- 'server2': { |
- 'app.yaml': AppYamlHelper.GenerateAppYaml('2-0-8') |
+ 'chrome': { |
+ 'browser': { |
+ 'extensions': { |
+ 'OWNERS': '', |
+ 'api': {} |
+ } |
}, |
- 'static': { |
- 'static.txt': 'static.txt contents' |
- }, |
- 'templates': { |
- 'articles': { |
- 'activeTab.html': 'activeTab.html contents' |
- }, |
- 'intros': { |
- 'browserAction.html': 'activeTab.html contents' |
- }, |
- 'private': { |
- 'table_of_contents.html': 'table_of_contents.html contents', |
- }, |
- 'public': { |
- 'apps': { |
- 'storage.html': '<h1>storage.html</h1> contents' |
- }, |
- 'extensions': { |
- 'storage.html': '<h1>storage.html</h1> contents' |
+ 'common': { |
+ 'extensions': { |
+ 'api': { |
+ '_api_features.json': '{}', |
+ '_manifest_features.json': '{}', |
+ '_permission_features.json': '{}', |
}, |
- }, |
- 'json': { |
- 'chrome_sidenav.json': '{}', |
- 'content_providers.json': ReadFile(CONTENT_PROVIDERS), |
- 'manifest.json': '{}', |
- 'permissions.json': '{}', |
- 'strings.json': '{}', |
- 'whats_new.json': '{}', |
- }, |
+ 'docs': { |
+ 'examples': { |
+ 'examples.txt': 'examples.txt contents' |
+ }, |
+ 'server2': { |
+ 'app.yaml': AppYamlHelper.GenerateAppYaml('2-0-8') |
+ }, |
+ 'static': { |
+ 'static.txt': 'static.txt contents' |
+ }, |
+ 'templates': { |
+ 'articles': { |
+ 'activeTab.html': 'activeTab.html contents' |
+ }, |
+ 'intros': { |
+ 'browserAction.html': 'activeTab.html contents' |
+ }, |
+ 'private': { |
+ 'table_of_contents.html': 'table_of_contents.html contents', |
+ }, |
+ 'public': { |
+ 'apps': { |
+ 'storage.html': '<h1>storage.html</h1> contents' |
+ }, |
+ 'extensions': { |
+ 'storage.html': '<h1>storage.html</h1> contents' |
+ }, |
+ }, |
+ 'json': { |
+ 'chrome_sidenav.json': '{}', |
+ 'content_providers.json': ReadFile(CONTENT_PROVIDERS), |
+ 'manifest.json': '{}', |
+ 'permissions.json': '{}', |
+ 'strings.json': '{}', |
+ 'whats_new.json': '{}', |
+ }, |
+ } |
+ } |
+ } |
} |
} |
} |
@@ -160,8 +177,7 @@ class CronServletTest(unittest.TestCase): |
'''Creates a MockFileSystem at |revision| by applying that many |updates| |
to it. |
''' |
- mock_file_system = MockFileSystem( |
- TestFileSystem(test_data, relative_to=CHROME_EXTENSIONS)) |
+ mock_file_system = MockFileSystem(TestFileSystem(test_data)) |
updates_for_revision = ( |
updates if revision is None else updates[:int(revision)]) |
for update in updates_for_revision: |