Refactoring: Move _port_skips_test to Port class.

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 25 matching lines @@
 import errno
 import itertools
 import json
 import logging
 import os
 import operator
 import optparse
 import re
 import sys
 
-
 from webkitpy.common import find_files
 from webkitpy.common import read_checksum_from_png
 from webkitpy.common.memoized import memoized
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.system.path import cygpath, abspath_to_uri
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.layout_tests.layout_package.bot_test_expectations import BotTestExpectationsFactory
 from webkitpy.layout_tests.models import test_run_results
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
+from webkitpy.layout_tests.models.test_expectations import SKIP
 from webkitpy.layout_tests.port import driver
 from webkitpy.layout_tests.port import server_process
 from webkitpy.layout_tests.port.factory import PortFactory
 from webkitpy.layout_tests.servers import apache_http
 from webkitpy.layout_tests.servers import pywebsocket
 from webkitpy.layout_tests.servers import wptserve
 from functools import reduce  # pylint: disable=redefined-builtin
 
 _log = logging.getLogger(__name__)
 
@@ skipping 859 matching lines @@
     def layout_tests_dir(self):
         return self._webkit_finder.layout_tests_dir()
 
     def perf_tests_dir(self):
         return self._webkit_finder.perf_tests_dir()
 
     def skipped_layout_tests(self, test_list):
         """Returns tests skipped outside of the TestExpectations files."""
         return set(self._skipped_tests_for_unsupported_features(test_list))
 
+    def skips_test(self, test, generic_expectations, full_expectations):
+        """Checks whether the given test is skipped for this port.
+
+        This should return True if the test is skipped because the port
+        runs smoke tests only, or because there's a skip test expectation line.
+        """
+        fs = self.host.filesystem
+        if self.default_smoke_test_only():
+            smoke_test_filename = fs.join(self.layout_tests_dir(), 'SmokeTests')
+            if fs.exists(smoke_test_filename) and test not in fs.read_text_file(smoke_test_filename):
+                return True
+
+        return (SKIP in full_expectations.get_expectations(test) and
+                SKIP not in generic_expectations.get_expectations(test))
+
     def _tests_from_skipped_file_contents(self, skipped_file_contents):
         tests_to_skip = []
         for line in skipped_file_contents.split('\n'):
             line = line.strip()
             line = line.rstrip('/')  # Best to normalize directory names to not include the trailing slash.
             if line.startswith('#') or not len(line):
                 continue
             tests_to_skip.append(line)
         return tests_to_skip
 
@@ skipping 884 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)