Extensions Docs Server: Preview server and more integration tests

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

Index: chrome/common/extensions/docs/server2/handler.py
diff --git a/chrome/common/extensions/docs/server2/handler.py b/chrome/common/extensions/docs/server2/handler.py
index e18b0ec8414cfba16cd489ae717a7fac0617e22e..ee8b3bb2b507b1a474f0d980b836d52bdd0be981 100644
--- a/chrome/common/extensions/docs/server2/handler.py
+++ b/chrome/common/extensions/docs/server2/handler.py
@@ -36,10 +36,11 @@ TRUNK_URL = SVN_URL + '/trunk'
 BRANCH_URL = SVN_URL + '/branches'
 
 OMAHA_PROXY_URL = 'http://omahaproxy.appspot.com/json'
+BRANCH_UTILITY_MEMCACHE = AppEngineMemcache('branch_utility')
 BRANCH_UTILITY = BranchUtility(OMAHA_PROXY_URL,
                                DEFAULT_BRANCH,
                                AppEngineUrlFetcher(''),
-                               AppEngineMemcache('branch_utility'))
+                               BRANCH_UTILITY_MEMCACHE)
 
 STATIC_DIR_PREFIX = 'docs/server2'
 EXTENSIONS_PATH = 'chrome/common/extensions'
@@ -121,7 +122,8 @@ class Handler(webapp.RequestHandler):
     path = self.request.path
     if '_ah/warmup' in path:
       logging.info('Warmup request.')
-      self._NavigateToPath('trunk/samples.html')
+      if DEFAULT_BRANCH != 'local':
+        self._NavigateToPath('trunk/samples.html')
       self._NavigateToPath('dev/samples.html')
       self._NavigateToPath('beta/samples.html')
       self._NavigateToPath('stable/samples.html')