Pass through in dual_browser_story for disabled benchmarks.

tools/perf/page_sets/dual_browser_story.py

 # Copyright 2016 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 logging
 import re
-import sys
 import urllib
 
-from telemetry import decorators
 from telemetry import story as story_module
 # TODO(perezju): Remove references to telementry.internal when
 # https://github.com/catapult-project/catapult/issues/2102 is resolved.
 from telemetry.internal.browser import browser_finder
 from telemetry.internal.browser import browser_finder_exceptions
 from telemetry.util import wpr_modes
 
 from page_sets.top_10_mobile import URL_LIST
 
 
@@ skipping 49 matching lines @@
         (s.browser_type, None) for s in story_set)
     self._current_story = None
     self._current_browser = None
     self._current_tab = None
 
     possible_browser = self._PrepareBrowser('default', finder_options)
     if not possible_browser:
       raise browser_finder_exceptions.BrowserFinderException(
           'No browser found.\n\nAvailable browsers:\n%s\n' %
           '\n'.join(browser_finder.GetAllAvailableBrowserTypes(finder_options)))
-    if not finder_options.run_disabled_tests:
-      self._CheckTestEnabled(test, possible_browser)
 
     extra_browser_types = set(story.browser_type for story in story_set)
     extra_browser_types.remove('default')  # Must include 'default' browser.
     for browser_type in extra_browser_types:
       options = _OptionsForBrowser(browser_type, finder_options)
       if not self._PrepareBrowser(browser_type, options):
         logging.warning('Skipping %s (%s) because %s browser is not available',

[perezju, 2016/09/30 13:28:01]

nit: Skipping -> Can't run

[eyaich1, 2016/09/30 13:32:22]

Done.

                         test.__name__, str(test), browser_type)
         logging.warning('Install %s to be able to run the test.', browser_type)
-        sys.exit(0)
+        raise Exception("Browser not available, unable to run benchmark.")
 
     # TODO(crbug/404771): Move network controller options out of
     # browser_options and into finder_options.
     browser_options = finder_options.browser_options
     if finder_options.use_live_sites:
       wpr_mode = wpr_modes.WPR_OFF
     elif browser_options.wpr_mode == wpr_modes.WPR_RECORD:
       wpr_mode = wpr_modes.WPR_RECORD
     else:
       wpr_mode = wpr_modes.WPR_REPLAY
 
     self.platform.network_controller.Open(wpr_mode,
                                           browser_options.extra_wpr_args)
 
   @property
   def current_tab(self):
     return self._current_tab
 
   @property
   def platform(self):
     return self._platform
 
-  def _CheckTestEnabled(self, test, possible_browser):
-    should_skip, msg = decorators.ShouldSkip(test, possible_browser)
-    if should_skip:
-      logging.warning(msg)
-      logging.warning('You are trying to run a disabled test.')
-      logging.warning(
-          'Pass --also-run-disabled-tests to squelch this message.')
-      sys.exit(0)
-
   def _PrepareBrowser(self, browser_type, options):
     """Add a browser to the dict of possible browsers.
 
     TODO(perezju): When available, use the GetBrowserForPlatform API instead.
     See: crbug.com/570348
 
     Returns:
       The possible browser if found, or None otherwise.
     """
     possible_browser = browser_finder.FindBrowser(options)
@@ skipping 128 matching lines @@
           url=GOOGLE_SEARCH + urllib.urlencode({'q': query}),
           browser_type='android-webview',
           phase='on_webview'))
 
       # Stories that run on the browser selected by command line options.
       self.AddStory(SinglePage(
           name=re.sub(r'\W+', '_', url),
           url=url,
           browser_type='default',
           phase='on_chrome'))