| Index: chrome/common/extensions/docs/server2/fake_fetchers.py
|
| diff --git a/chrome/common/extensions/docs/server2/fake_fetchers.py b/chrome/common/extensions/docs/server2/fake_fetchers.py
|
| index 4c132717b2230fb4e43b2932e2512c5a0dd17817..fa41456a39691a2c59143bf675a122a86401eb59 100644
|
| --- a/chrome/common/extensions/docs/server2/fake_fetchers.py
|
| +++ b/chrome/common/extensions/docs/server2/fake_fetchers.py
|
| @@ -80,13 +80,18 @@ class _FakeSubversionServer(_FakeFetcher):
|
| _GITILES_BASE_RE = re.escape(url_constants.GITILES_BASE)
|
| _GITILES_BRANCH_BASE_RE = re.escape(url_constants.GITILES_BRANCH_BASE)
|
| _GITILES_URL_TO_PATH_PATTERN = re.compile(
|
| - r'(' + _GITILES_BASE_RE + r'|' + _GITILES_BRANCH_BASE_RE + r').+?/(.*)')
|
| + r'(' + _GITILES_BRANCH_BASE_RE + r'|' + _GITILES_BASE_RE + r').+?/(.*)')
|
| def _ExtractPathFromGitilesUrl(url):
|
| return _GITILES_URL_TO_PATH_PATTERN.match(url).group(2)
|
|
|
|
|
| class _FakeGitilesServer(_FakeFetcher):
|
| def fetch(self, url):
|
| + if _GITILES_URL_TO_PATH_PATTERN.match(url) is None:
|
| + return json.dumps({
|
| + 'commit': '1' * 40,
|
| + 'parents': ['0' * 40]
|
| + })
|
| path = _ExtractPathFromGitilesUrl(url)
|
| chromium_path = ChromiumPath(path)
|
| if self._IsDir(chromium_path):
|
| @@ -97,9 +102,11 @@ class _FakeGitilesServer(_FakeFetcher):
|
| for f in self._ListDir(chromium_path):
|
| if f.startswith('.'):
|
| continue
|
| + f_path = os.path.join(chromium_path, f)
|
| jsn['entries'].append({
|
| - 'id': self._Stat(os.path.join(chromium_path, f)),
|
| - 'name': f
|
| + 'id': self._Stat(f_path),
|
| + 'name': f,
|
| + 'type': 'tree' if self._IsDir(f_path) else 'blob'
|
| })
|
| return json.dumps(jsn)
|
| try:
|
|
|