Title: [111663] trunk/Tools
- Revision
- 111663
- Author
- ph...@webkit.org
- Date
- 2012-03-22 02:34:41 -0700 (Thu, 22 Mar 2012)
Log Message
Unreviewed, test-webkitpy fix after r111661.
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
(MainTest.test_crash_log):
(MainTest.test_web_process_crash_log):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (111662 => 111663)
--- trunk/Tools/ChangeLog 2012-03-22 08:44:47 UTC (rev 111662)
+++ trunk/Tools/ChangeLog 2012-03-22 09:34:41 UTC (rev 111663)
@@ -1,5 +1,13 @@
2012-03-22 Philippe Normand <pnorm...@igalia.com>
+ Unreviewed, test-webkitpy fix after r111661.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ (MainTest.test_crash_log):
+ (MainTest.test_web_process_crash_log):
+
+2012-03-22 Philippe Normand <pnorm...@igalia.com>
+
Unreviewed, test-webkitpy fix after r111642.
* Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (111662 => 111663)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-03-22 08:44:47 UTC (rev 111662)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-03-22 09:34:41 UTC (rev 111663)
@@ -584,6 +584,9 @@
def test_crash_log(self):
# FIXME: Need to rewrite these tests to not be mac-specific, or move them elsewhere.
+ # Currently CrashLog uploading only works on Darwin.
+ if sys.platform != "darwin":
+ return
mock_crash_report = make_mock_crash_report_darwin('DumpRenderTree', 12345)
host = MockHost()
host.filesystem.write_text_file('/Users/mock/Library/Logs/DiagnosticReports/DumpRenderTree_2011-06-13-150719_quadzen.crash', mock_crash_report)
@@ -594,13 +597,13 @@
record_results=True,
host=host)
expected_crash_log = mock_crash_report
- # Currently CrashLog uploading only works on Darwin.
- if sys.platform != "darwin":
- expected_crash_log = ""
self.assertEquals(host.filesystem.read_text_file('/tmp/layout-test-results/failures/unexpected/crash-with-stderr-crash-log.txt'), expected_crash_log)
def test_web_process_crash_log(self):
# FIXME: Need to rewrite these tests to not be mac-specific, or move them elsewhere.
+ # Currently CrashLog uploading only works on Darwin.
+ if sys.platform != "darwin":
+ return
mock_crash_report = make_mock_crash_report_darwin('WebProcess', 12345)
host = MockHost()
host.filesystem.write_text_file('/Users/mock/Library/Logs/DiagnosticReports/WebProcess_2011-06-13-150719_quadzen.crash', mock_crash_report)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
