[Telemetry] Reorganize everything.

tools/telemetry/telemetry/page/page_runner.py

 # Copyright (c) 2012 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.
 import codecs
 import logging
 import os
 import time
 import traceback
 import urlparse
 import random
 
-from telemetry import browser_gone_exception
-from telemetry import page_filter as page_filter_module
-from telemetry import page_test
-from telemetry import tab_crash_exception
-from telemetry import util
-from telemetry import wpr_modes
+from telemetry.core import util
+from telemetry.core import wpr_modes
+from telemetry.core import exceptions
+from telemetry.page import page_filter as page_filter_module
+from telemetry.page import page_test
 
 class PageState(object):
   def __init__(self):
     self.did_login = False
 
 class _RunState(object):
   def __init__(self):
     self.first_browser = True
     self.browser = None
     self.tab = None
@@ skipping 110 matching lines @@
                                  credentials_path, page.archive_path)
             if not state.tab:
               if len(state.browser.tabs) == 0:
                 state.browser.tabs.New()
               state.tab = state.browser.tabs[0]
             if options.trace_dir:
               self._SetupTracingTab(state)
 
             try:
               self._RunPage(options, page, state.tab, test, results)
-            except tab_crash_exception.TabCrashException:
+            except exceptions.TabCrashException:
               stdout = ''
               if not options.show_stdout:
                 stdout = state.browser.GetStandardOutput()
                 stdout = (('\nStandard Output:\n') +
                           ('*' * 80) +
                           '\n\t' + stdout.replace('\n', '\n\t') + '\n' +
                           ('*' * 80))
               logging.warning('Tab crashed: %s%s', page.url, stdout)
               state.Close()
 
             if options.trace_dir:
               self._EndTracing(state, options, page)
 
             if test.needs_browser_restart_after_each_run:
               state.Close()
 
             break
-          except browser_gone_exception.BrowserGoneException:
+          except exceptions.BrowserGoneException:
             logging.warning('Lost connection to browser. Retrying.')
             state.Close()
             tries -= 1
             if not tries:
               logging.error('Lost connection to browser 3 times. Failing.')
               raise
     finally:
       state.Close()
 
   def _RunPage(self, options, page, tab, test, results):
     if not test.CanRunForPage(page):
       logging.warning('Skiping test: it cannot run for %s', page.url)
       results.AddSkippedPage(page, 'Test cannot run', '')
       return
 
     logging.info('Running %s' % page.url)
 
     page_state = PageState()
     try:
       did_prepare = self._PreparePage(page, tab, page_state, test, results)
     except util.TimeoutException, ex:
       logging.warning('Timed out waiting for reply on %s. This is unusual.',
                       page.url)
       results.AddFailure(page, ex, traceback.format_exc())
       return
-    except tab_crash_exception.TabCrashException, ex:
+    except exceptions.TabCrashException, ex:
       results.AddFailure(page, ex, traceback.format_exc())
       raise
-    except browser_gone_exception.BrowserGoneException:
+    except exceptions.BrowserGoneException:
       raise
     except Exception, ex:
       logging.error('Unexpected failure while running %s: %s',
                     page.url, traceback.format_exc())
       self._CleanUpPage(page, tab, page_state)
       raise
 
     if not did_prepare:
       self._CleanUpPage(page, tab, page_state)
       return
 
     try:
       test.Run(options, page, tab, results)
     except page_test.Failure, ex:
       logging.info('%s: %s', ex, page.url)
       results.AddFailure(page, ex, traceback.format_exc())
       return
     except util.TimeoutException, ex:
       logging.warning('Timed out while running %s', page.url)
       results.AddFailure(page, ex, traceback.format_exc())
       return
-    except tab_crash_exception.TabCrashException, ex:
+    except exceptions.TabCrashException, ex:
       results.AddFailure(page, ex, traceback.format_exc())
       raise
-    except browser_gone_exception.BrowserGoneException:
+    except exceptions.BrowserGoneException:
       raise
     except Exception, ex:
       logging.error('Unexpected failure while running %s: %s',
                     page.url, traceback.format_exc())
       raise
     finally:
       self._CleanUpPage(page, tab, page_state)
 
     results.AddSuccess(page)
 
@@ skipping 80 matching lines @@
       tab.browser.credentials.LoginNoLongerNeeded(tab, page.credentials)
     try:
       tab.EvaluateJavaScript("""window.chrome && chrome.benchmarking &&
                               chrome.benchmarking.closeConnections()""")
     except Exception:
       pass
 
   @staticmethod
   def AddCommandLineOptions(parser):
     page_filter_module.PageFilter.AddCommandLineOptions(parser)