Title: [117168] trunk/Tools
- Revision
- 117168
- Author
- [email protected]
- Date
- 2012-05-15 15:05:53 -0700 (Tue, 15 May 2012)
Log Message
add unit test for NRWT's --additional-expectations option
https://bugs.webkit.org/show_bug.cgi?id=86501
Patch by Elliot Poger <[email protected]> on 2012-05-15
Reviewed by Ojan Vafai.
* Scripts/webkitpy/layout_tests/port/base_unittest.py:
(PortTest.test_additional_expectations):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (117167 => 117168)
--- trunk/Tools/ChangeLog 2012-05-15 21:48:49 UTC (rev 117167)
+++ trunk/Tools/ChangeLog 2012-05-15 22:05:53 UTC (rev 117168)
@@ -1,3 +1,13 @@
+2012-05-15 Elliot Poger <[email protected]>
+
+ add unit test for NRWT's --additional-expectations option
+ https://bugs.webkit.org/show_bug.cgi?id=86501
+
+ Reviewed by Ojan Vafai.
+
+ * Scripts/webkitpy/layout_tests/port/base_unittest.py:
+ (PortTest.test_additional_expectations):
+
2012-05-15 James Robinson <[email protected]>
[chromium] Move createOffscreenGraphicsContext3D() from WebKitPlatformSupport to Platform
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py (117167 => 117168)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py 2012-05-15 21:48:49 UTC (rev 117167)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py 2012-05-15 22:05:53 UTC (rev 117168)
@@ -278,6 +278,28 @@
[('/tmp/local-baselines', 'fast/test-expected.txt')])
self.assertEqual(port.baseline_path(), '/foo')
+ def test_additional_expectations(self):
+ port = self.make_port(port_name='foo')
+
+ port._filesystem.write_text_file(
+ '/tmp/additional-expectations-1.txt', 'content1\n')
+ port._filesystem.write_text_file(
+ '/tmp/additional-expectations-2.txt', 'content2\n')
+
+ self.assertEquals(None, port.test_expectations_overrides())
+
+ port._options.additional_expectations = [
+ '/tmp/additional-expectations-1.txt']
+ self.assertEquals('content1\n', port.test_expectations_overrides())
+
+ port._options.additional_expectations = [
+ '/tmp/nonexistent-file', '/tmp/additional-expectations-1.txt']
+ self.assertEquals('content1\n', port.test_expectations_overrides())
+
+ port._options.additional_expectations = [
+ '/tmp/additional-expectations-1.txt', '/tmp/additional-expectations-2.txt']
+ self.assertEquals('content1\ncontent2\n', port.test_expectations_overrides())
+
def test_uses_test_expectations_file(self):
port = self.make_port(port_name='foo')
port.path_to_test_expectations_file = lambda: '/mock-results/test_expectations.txt'
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
