Docserver: refactor the Handler/ServerInstance relationship into a servlet

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

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ import print_function
+
 # Run build_server so that files needed by tests are copied to the local
 # third_party directory.
 import build_server
 build_server.main()
 
 import logging
 import optparse
 import os
 import sys
 import time
 import unittest
 
-from handler import Handler
 from local_renderer import LocalRenderer
+from render_servlet import AlwaysOnline
 from test_util import DisableLogging
 
 # Arguments set up if __main__ specifies them.
 _BASE_PATH = os.path.join(
     os.path.abspath(os.path.dirname(__file__)), os.pardir, os.pardir)
 _EXPLICIT_TEST_FILES = None
 
 def _GetPublicFiles():
   '''Gets all public files mapped to their contents.
   '''
@@ skipping 14 matching lines @@
   def testCronAndPublicFiles(self):
     '''Runs cron then requests every public file. Cron needs to be run first
     because the public file requests are offline.
     '''
     if _EXPLICIT_TEST_FILES is not None:
       return
 
     print('Running cron...')
     start_time = time.time()
     try:
-      render_content, render_status, _ = self._renderer.Render('/cron/stable')
+      logging_info = logging.info
+      logging.info = print
+      render_content, render_status, _ = self._renderer.Render('/_cron/stable')
       self.assertEqual(200, render_status)
       self.assertEqual('Success', render_content)
     finally:
+      logging.info = logging_info
       print('Took %s seconds' % (time.time() - start_time))
 
     public_files = _GetPublicFiles()
 
     print('Rendering %s public files...' % len(public_files.keys()))
     start_time = time.time()
     try:
       for path, content in _GetPublicFiles().iteritems():
         def check_result(render_content, render_status, _):
           self.assertEqual(200, render_status,
               'Got %s when rendering %s' % (render_status, path))
           # This is reaaaaally rough since usually these will be tiny templates
           # that render large files. At least it'll catch zero-length responses.
           self.assertTrue(len(render_content) >= len(content),
               'Content was "%s" when rendering %s' % (render_content, path))
         check_result(*self._renderer.Render(path))
         # Samples are internationalized, test some locales.
         if path.endswith('/samples.html'):
           for lang in ['en-US', 'es', 'ar']:
             check_result(*self._renderer.Render(
                 path, headers={'Accept-Language': '%s;q=0.8' % lang}))
     finally:
       print('Took %s seconds' % (time.time() - start_time))
 
+  @AlwaysOnline
   def testExplicitFiles(self):
     '''Tests just the files in _EXPLICIT_TEST_FILES.
     '''
     if _EXPLICIT_TEST_FILES is None:
       return
     for filename in _EXPLICIT_TEST_FILES:
       print('Rendering %s...' % filename)
       start_time = time.time()
       try:
-        render_content, render_status, _ = self._renderer.Render(
-            filename, always_online=True)
+        render_content, render_status, _ = self._renderer.Render(filename)
         self.assertEqual(200, render_status)
         self.assertTrue(render_content != '')
       finally:
         print('Took %s seconds' % (time.time() - start_time))
 
   @DisableLogging('warning')
+  @AlwaysOnline
   def testFileNotFound(self):
     render_content, render_status, _ = self._renderer.Render(
-        '/extensions/notfound.html', always_online=True)
+        '/extensions/notfound.html')
     self.assertEqual(404, render_status)
 
 if __name__ == '__main__':
   parser = optparse.OptionParser()
   parser.add_option('-p', '--path', default=None)
   parser.add_option('-a', '--all', action='store_true', default=False)
   (opts, args) = parser.parse_args()
   if not opts.all:
     _EXPLICIT_TEST_FILES = args
   if opts.path is not None:
     _BASE_PATH = opts.path
   # Kill sys.argv because we have our own flags.
   sys.argv = [sys.argv[0]]
   unittest.main()