Title: [106735] trunk/Tools
Revision
106735
Author
[email protected]
Date
2012-02-04 01:50:47 -0800 (Sat, 04 Feb 2012)

Log 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):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (106734 => 106735)


--- trunk/Tools/ChangeLog	2012-02-04 09:42:39 UTC (rev 106734)
+++ trunk/Tools/ChangeLog	2012-02-04 09:50:47 UTC (rev 106735)
@@ -1,3 +1,18 @@
+2012-02-04  Ojan Vafai  <[email protected]>
+
+        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  <[email protected]>
 
         List of all failures in garden-o-matic should actually list all the failures

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (106734 => 106735)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py	2012-02-04 09:42:39 UTC (rev 106734)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py	2012-02-04 09:50:47 UTC (rev 106735)
@@ -307,6 +307,9 @@
         }
 
     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):
             if test.startswith(directory):

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py (106734 => 106735)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py	2012-02-04 09:42:39 UTC (rev 106734)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py	2012-02-04 09:50:47 UTC (rev 106735)
@@ -145,6 +145,12 @@
         result_directories = set(TestWebKitPort(None, supported_features)._skipped_tests_for_unsupported_features(test_list=['foo.html']))
         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']))
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to