Changeset 106735 in webkit

Timestamp:

Feb 4, 2012, 1:50:47 AM (15 years ago)

Author:

ojan@chromium.org

Message:

check-webkit-style is throwing an exception
​https://bugs.webkit.org/show_bug.cgi?id=77744

Reviewed by David Levin.

If the test_list is None, then we don't need to check for unsupported
feature tests to skip.

• Scripts/webkitpy/layout_tests/port/webkit.py:

(WebKitPort._has_test_in_directories):

• Scripts/webkitpy/layout_tests/port/webkit_unittest.py:

(test_skipped_tests_for_unsupported_features_empty_test_list):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-02-04  Ojan Vafai  <ojan@chromium.org>
+
+        check-webkit-style is throwing an exception
+        https://bugs.webkit.org/show_bug.cgi?id=77744
+
+        Reviewed by David Levin.
+
+        If the test_list is None, then we don't need to check for unsupported
+        feature tests to skip.
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        (WebKitPort._has_test_in_directories):
+        * Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
+        (test_skipped_tests_for_unsupported_features_empty_test_list):
+
 2012-02-03  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py

@@ -308 +308 @@
 
     def _has_test_in_directories(self, directory_lists, test_list):
+        if not test_list:
+            return False
+
         directories = itertools.chain.from_iterable(directory_lists)
         for directory, test in itertools.product(directories, test_list):

trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py

@@ -146 +146 @@
         self.assertEqual(result_directories, expected_directories)
 
+    def test_skipped_tests_for_unsupported_features_empty_test_list(self):
+        supported_features = ["Accelerated Compositing", "Foo Feature"]
+        expected_directories = set([])
+        result_directories = set(TestWebKitPort(None, supported_features)._skipped_tests_for_unsupported_features(test_list=None))
+        self.assertEqual(result_directories, expected_directories)
+
     def test_skipped_layout_tests(self):
         self.assertEqual(TestWebKitPort(None, None).skipped_layout_tests(test_list=[]), set(['media']))