Title: [241318] trunk/Tools
- Revision
- 241318
- Author
- [email protected]
- Date
- 2019-02-12 13:53:00 -0800 (Tue, 12 Feb 2019)
Log Message
webkitpy: No option to only show unexpected failures in results.html for iPad
https://bugs.webkit.org/show_bug.cgi?id=194554
<rdar://problem/47922442>
Rubber-stamped by Aakash Jain.
Just because a TestExpecations file does not exist for a specific platform does not mean that
TestExpecations are not being used, given that platforms inherit test expectations.
* Scripts/webkitpy/port/base.py:
(Port.uses_test_expectations_file): Check all possible locations of a TestExpectations file.
* Scripts/webkitpy/port/base_unittest.py:
(PortTest.test_uses_test_expectations_file):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (241317 => 241318)
--- trunk/Tools/ChangeLog 2019-02-12 21:49:39 UTC (rev 241317)
+++ trunk/Tools/ChangeLog 2019-02-12 21:53:00 UTC (rev 241318)
@@ -1,3 +1,19 @@
+2019-02-12 Jonathan Bedard <[email protected]>
+
+ webkitpy: No option to only show unexpected failures in results.html for iPad
+ https://bugs.webkit.org/show_bug.cgi?id=194554
+ <rdar://problem/47922442>
+
+ Rubber-stamped by Aakash Jain.
+
+ Just because a TestExpecations file does not exist for a specific platform does not mean that
+ TestExpecations are not being used, given that platforms inherit test expectations.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.uses_test_expectations_file): Check all possible locations of a TestExpectations file.
+ * Scripts/webkitpy/port/base_unittest.py:
+ (PortTest.test_uses_test_expectations_file):
+
2019-02-12 Alex Christensen <[email protected]>
Remove setDefersLoading infrastructure from WebKit2
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (241317 => 241318)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2019-02-12 21:49:39 UTC (rev 241317)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2019-02-12 21:53:00 UTC (rev 241318)
@@ -1157,7 +1157,10 @@
def uses_test_expectations_file(self):
# This is different from checking test_expectations() is None, because
# some ports have Skipped files which are returned as part of test_expectations().
- return self._filesystem.exists(self.path_to_test_expectations_file())
+ for path in self.default_baseline_search_path():
+ if self._filesystem.exists(self._filesystem.join(path, 'TestExpectations')):
+ return True
+ return False
def warn_if_bug_missing_in_test_expectations(self):
return False
Modified: trunk/Tools/Scripts/webkitpy/port/base_unittest.py (241317 => 241318)
--- trunk/Tools/Scripts/webkitpy/port/base_unittest.py 2019-02-12 21:49:39 UTC (rev 241317)
+++ trunk/Tools/Scripts/webkitpy/port/base_unittest.py 2019-02-12 21:53:00 UTC (rev 241318)
@@ -225,9 +225,8 @@
def test_uses_test_expectations_file(self):
port = self.make_port(port_name='foo')
port.port_name = 'foo'
- port.path_to_test_expectations_file = lambda: '/mock-results/TestExpectations'
self.assertFalse(port.uses_test_expectations_file())
- port._filesystem = MockFileSystem({'/mock-results/TestExpectations': ''})
+ port._filesystem = MockFileSystem({'/mock-checkout/LayoutTests/platform/foo/TestExpectations': ''})
self.assertTrue(port.uses_test_expectations_file())
def test_find_no_paths_specified(self):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes