Docserver: refactor the Handler/ServerInstance relationship into a servlet

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

Index: chrome/common/extensions/docs/server2/integration_test.py
diff --git a/chrome/common/extensions/docs/server2/integration_test.py b/chrome/common/extensions/docs/server2/integration_test.py
index 7f86804c5ecbdd81aead45335759544d21e41567..c5f8a27050f8640a6a0874e7d0ccbb8931e01ada 100755
--- a/chrome/common/extensions/docs/server2/integration_test.py
+++ b/chrome/common/extensions/docs/server2/integration_test.py
@@ -3,6 +3,8 @@
 # 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
@@ -15,8 +17,8 @@ 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.
@@ -51,10 +53,13 @@ class IntegrationTest(unittest.TestCase):
     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()
@@ -79,6 +84,7 @@ class IntegrationTest(unittest.TestCase):
     finally:
       print('Took %s seconds' % (time.time() - start_time))
 
+  @AlwaysOnline
   def testExplicitFiles(self):
     '''Tests just the files in _EXPLICIT_TEST_FILES.
     '''
@@ -88,17 +94,17 @@ class IntegrationTest(unittest.TestCase):
       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__':