Title: [124870] trunk/Tools
- Revision
- 124870
- Author
- [email protected]
- Date
- 2012-08-07 02:15:12 -0700 (Tue, 07 Aug 2012)
Log Message
REGRESSION(r124800): It broke NRWT result parsing of build.webkit.org
https://bugs.webkit.org/show_bug.cgi?id=93346
Rubber-stamped by Simon Hausmann.
Change back "unexpected" to "Unexpected", because master.cfg's results parser expects it.
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
(MainTest.test_retrying_and_flaky_tests):
* Scripts/webkitpy/layout_tests/views/printing.py:
(Printer._print_unexpected_results):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (124869 => 124870)
--- trunk/Tools/ChangeLog 2012-08-07 08:50:43 UTC (rev 124869)
+++ trunk/Tools/ChangeLog 2012-08-07 09:15:12 UTC (rev 124870)
@@ -1,3 +1,17 @@
+2012-08-07 Csaba Osztrogonác <[email protected]>
+
+ REGRESSION(r124800): It broke NRWT result parsing of build.webkit.org
+ https://bugs.webkit.org/show_bug.cgi?id=93346
+
+ Rubber-stamped by Simon Hausmann.
+
+ Change back "unexpected" to "Unexpected", because master.cfg's results parser expects it.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ (MainTest.test_retrying_and_flaky_tests):
+ * Scripts/webkitpy/layout_tests/views/printing.py:
+ (Printer._print_unexpected_results):
+
2012-08-06 Balazs Kelemen <[email protected]>
[NRWT] runs platform specific tests that it shouldn't with --force
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (124869 => 124870)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-08-07 08:50:43 UTC (rev 124869)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-08-07 09:15:12 UTC (rev 124870)
@@ -752,7 +752,7 @@
res, out, err, _ = logging_run(['--debug-rwt-logging', 'failures/flaky'], tests_included=True, host=host)
self.assertEquals(res, 0)
self.assertTrue('Retrying' in err.getvalue())
- self.assertTrue('unexpected flakiness' in out.getvalue())
+ self.assertTrue('Unexpected flakiness' in out.getvalue())
self.assertTrue(host.filesystem.exists('/tmp/layout-test-results/failures/flaky/text-actual.txt'))
self.assertTrue(host.filesystem.exists('/tmp/layout-test-results/retries/tests_run0.txt'))
self.assertFalse(host.filesystem.exists('/tmp/layout-test-results/retries/failures/flaky/text-actual.txt'))
@@ -764,8 +764,8 @@
self.assertEquals(res, 1)
self.assertTrue('Clobbering old results' in err.getvalue())
self.assertTrue('flaky/text.html' in err.getvalue())
- self.assertTrue('unexpected text diff' in out.getvalue())
- self.assertFalse('unexpected flakiness' in out.getvalue())
+ self.assertTrue('Unexpected text diff' in out.getvalue())
+ self.assertFalse('Unexpected flakiness' in out.getvalue())
self.assertTrue(host.filesystem.exists('/tmp/layout-test-results/failures/flaky/text-actual.txt'))
self.assertFalse(host.filesystem.exists('retries'))
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py (124869 => 124870)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2012-08-07 08:50:43 UTC (rev 124869)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2012-08-07 09:15:12 UTC (rev 124870)
@@ -418,7 +418,7 @@
descriptions = TestExpectations.EXPECTATION_DESCRIPTIONS
for key, tests in flaky.iteritems():
result = TestExpectations.EXPECTATIONS[key.lower()]
- self._print_for_bot("unexpected flakiness: %s (%d)" % (descriptions[result][1], len(tests)))
+ self._print_for_bot("Unexpected flakiness: %s (%d)" % (descriptions[result][1], len(tests)))
tests.sort()
for test in tests:
@@ -435,7 +435,7 @@
descriptions = TestExpectations.EXPECTATION_DESCRIPTIONS
for key, tests in regressions.iteritems():
result = TestExpectations.EXPECTATIONS[key.lower()]
- self._print_for_bot("Regressions: unexpected %s : (%d)" % (descriptions[result][1], len(tests)))
+ self._print_for_bot("Regressions: Unexpected %s : (%d)" % (descriptions[result][1], len(tests)))
tests.sort()
for test in tests:
self._print_for_bot(" %s = %s" % (test, key))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
