Rename functions in Port related to wptserve and add a helper function.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 157 matching lines @@
         self._options = options or optparse.Values()
 
         self.host = host
         self._executive = host.executive
         self._filesystem = host.filesystem
         self._webkit_finder = WebKitFinder(host.filesystem)
 
         self._helper = None
         self._http_server = None
         self._websocket_server = None
-        self._is_wpt_enabled = hasattr(options, 'enable_wptserve') and options.enable_wptserve
+        self._is_wptserve_enabled = getattr(options, 'enable_wptserve', False)
         self._wpt_server = None
         self._image_differ = None
         self._server_process_constructor = server_process.ServerProcess  # overridable for testing
         self._http_lock = None  # FIXME: Why does this live on the port object?
         self._dump_reader = None
 
         # Python's Popen has a bug that causes any pipes opened to a
         # process that can't be executed to be leaked.  Since this
         # code is specifically designed to tolerate exec failures
         # to gracefully handle cases where wdiff is not installed,
@@ skipping 969 matching lines @@
     def start_websocket_server(self):
         """Start a web server. Raise an error if it can't start or is already running.
 
         Ports can stub this out if they don't need a websocket server to be running."""
         assert not self._websocket_server, 'Already running a websocket server.'
 
         server = pywebsocket.PyWebSocket(self, self.results_directory())
         server.start()
         self._websocket_server = server
 
-    def is_wpt_enabled(self):
+    def is_wptserve_enabled(self):
         """Used as feature flag for WPT Serve feature."""
-        return self._is_wpt_enabled
+        return self._is_wptserve_enabled
 
-    def is_wpt_test(self, test):
-        """Whether this test is part of a web-platform-tests which require wptserve servers."""
+    @staticmethod
+    def is_wptserve_test(test):
+        """Whether wptserve should be used for a given test if enabled."""
         return test.startswith("imported/wpt/")
 
+    def should_use_wptserve(self, test):
+        return self.is_wptserve_enabled() and self.is_wptserve_test(test)
+
     def start_wptserve(self):
         """Start a WPT web server. Raise an error if it can't start or is already running.
 
         Ports can stub this out if they don't need a WPT web server to be running."""
         assert not self._wpt_server, 'Already running an http server.'
-        assert self.is_wpt_enabled(), 'Cannot start server if WPT is not enabled.'
+        assert self.is_wptserve_enabled(), 'Cannot start server if WPT is not enabled.'
 
         # We currently don't support any output mechanism for the WPT server.
         server = wptserve.WPTServe(self, self.results_directory())
         server.start()
         self._wpt_server = server
 
     def stop_wptserve(self):
         """Shut down the WPT server if it is running. Do nothing if it isn't."""
         if self._wpt_server:
             self._wpt_server.stop()
@@ skipping 124 matching lines @@
         _log.warning("Unexpected ignore mode: '%s'." % ignore_mode)
         return {}
 
     def expectations_files(self):
         paths = [
             self.path_to_generic_test_expectations_file(),
             self._filesystem.join(self.layout_tests_dir(), 'NeverFixTests'),
             self._filesystem.join(self.layout_tests_dir(), 'StaleTestExpectations'),
             self._filesystem.join(self.layout_tests_dir(), 'SlowTests'),
         ]
-        if self._is_wpt_enabled:
+        if self.is_wptserve_enabled():
             paths.append(self._filesystem.join(self.layout_tests_dir(), 'WPTServeExpectations'))
         paths.extend(self._flag_specific_expectations_files())
         return paths
 
     def repository_path(self):
         """Returns the repository path for the chromium code base."""
         return self.path_from_chromium_base('build')
 
     _WDIFF_DEL = '##WDIFF_DEL##'
     _WDIFF_ADD = '##WDIFF_ADD##'
@@ skipping 313 matching lines @@
             if test_name.startswith(suite.name):
                 return suite.reference_args
         return []
 
     def should_run_as_pixel_test(self, test_input):
         if not self._options.pixel_tests:
             return False
         if self._options.pixel_test_directories:
             return any(test_input.test_name.startswith(directory) for directory in self._options.pixel_test_directories)
         # TODO(burnik): Make sure this is the right way to do it.
-        if self.is_wpt_enabled() and self.is_wpt_test(test_input.test_name):
+        if self.should_use_wptserve(test_input.test_name):
             return False
         return True
 
     def _modules_to_search_for_symbols(self):
         path = self._path_to_webcore_library()
         if path:
             return [path]
         return []
 
     def _symbols_string(self):
@@ skipping 113 matching lines @@
 
     def __init__(self, base, args, reference_args=None):
         self.name = base
         self.base = base
         self.args = args
         self.reference_args = args if reference_args is None else reference_args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args)