Kill AddError/AddErrorMessage from PageTestResults.

tools/telemetry/telemetry/page/page_runner.py

 # Copyright 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 collections
 import copy
 import logging
 import optparse
 import os
 import random
@@ skipping 405 matching lines @@
         while state.repeat_state.ShouldRepeatPage():
           results = _PrepareAndRunPage(
               test, page_set, expectations, finder_options, browser_options,
               page, credentials_path, possible_browser, results, state)
           state.repeat_state.DidRunPage()
         test.DidRunPageRepeats(page)
         if (not test.max_failures is None and
             len(results.failures) > test.max_failures):
           logging.error('Too many failures. Aborting.')
           test.RequestExit()
-        if (not test.max_errors is None and
-            len(results.errors) > test.max_errors):
-          logging.error('Too many errors. Aborting.')
-          test.RequestExit()
         if test.IsExiting():
           break
       state.repeat_state.DidRunPageSet()
 
     test.DidRunTest(state.browser, results)
   finally:
     state.StopBrowser()
 
   return results
 
@@ skipping 53 matching lines @@
                     'against live sites, pass the flag --use-live-sites.')
   if pages_missing_archive_data:
     logging.warning('The page set archives for some pages are missing. '
                     'Someone forgot to check them in, or they were deleted. '
                     'Skipping those pages. To fix this, record those pages '
                     'using record_wpr. To ignore this warning and run '
                     'against live sites, pass the flag --use-live-sites.')
 
   for page in pages_missing_archive_path + pages_missing_archive_data:
     results.StartTest(page)
-    results.AddErrorMessage(page, 'Page set archive doesn\'t exist.')
+    results.AddFailureMessage(page, 'Page set archive doesn\'t exist.')
     results.StopTest(page)
 
   return [page for page in pages if page not in
           pages_missing_archive_path + pages_missing_archive_data]
 
 
 def _RunPage(test, page, state, expectation, results, finder_options):
   if expectation == 'skip':
     logging.debug('Skipping test: Skip expectation for %s', page.url)
     results.AddSkip(page, 'Skipped by test expectations')
     return
 
   logging.info('Running %s', page.url)
 
   page_state = PageState(page, test.TabForPage(page, state.browser))
 
   def ProcessError():
     if expectation == 'fail':
       msg = 'Expected exception while running %s' % page.url
       results.AddSuccess(page)
     else:
       msg = 'Exception while running %s' % page.url
-      results.AddError(page, sys.exc_info())
+      results.AddFailure(page, sys.exc_info())
     exception_formatter.PrintFormattedException(msg=msg)
 
   try:
     page_state.PreparePage(test)
     if state.repeat_state.ShouldNavigate(
         finder_options.skip_navigate_on_repeat):
       page_state.ImplicitPageNavigation(test)
     test.RunPage(page, page_state.tab, results)
     util.CloseConnections(page_state.tab)
   except page_test.TestNotSupportedOnPlatformFailure:
@@ skipping 43 matching lines @@
     logging.warning('Device is thermally throttled before running '
                     'performance tests, results will vary.')
 
 
 def _CheckThermalThrottling(platform):
   if not platform.CanMonitorThermalThrottling():
     return
   if platform.HasBeenThermallyThrottled():
     logging.warning('Device has been thermally throttled during '
                     'performance tests, results will vary.')