Title: [97522] trunk/LayoutTests
Revision
97522
Author
[email protected]
Date
2011-10-14 15:40:22 -0700 (Fri, 14 Oct 2011)

Log Message

nrwt's results.html should show crashed tests before flaky tests
https://bugs.webkit.org/show_bug.cgi?id=66041

Reviewed by Ojan Vafai.

Fixed the over by changing the order in which we aggregate results.

* fast/harness/resources/results-test.js: Added a test.
* fast/harness/results-expected.txt:
* fast/harness/results.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (97521 => 97522)


--- trunk/LayoutTests/ChangeLog	2011-10-14 22:37:16 UTC (rev 97521)
+++ trunk/LayoutTests/ChangeLog	2011-10-14 22:40:22 UTC (rev 97522)
@@ -1,3 +1,16 @@
+2011-10-14  Ryosuke Niwa  <[email protected]>
+
+        nrwt's results.html should show crashed tests before flaky tests
+        https://bugs.webkit.org/show_bug.cgi?id=66041
+
+        Reviewed by Ojan Vafai.
+
+        Fixed the over by changing the order in which we aggregate results.
+
+        * fast/harness/resources/results-test.js: Added a test.
+        * fast/harness/results-expected.txt:
+        * fast/harness/results.html:
+
 2011-10-14  Dimitri Glazkov  <[email protected]>
 
         [Chromium] Update expectations after r97502.

Modified: trunk/LayoutTests/fast/harness/resources/results-test.js (97521 => 97522)


--- trunk/LayoutTests/fast/harness/resources/results-test.js	2011-10-14 22:37:16 UTC (rev 97521)
+++ trunk/LayoutTests/fast/harness/resources/results-test.js	2011-10-14 22:40:22 UTC (rev 97522)
@@ -495,6 +495,20 @@
         assertTrue(enclosingNodeWithTagNameHasClassName(testLinks[2], 'table', 'expected'));
     });
 
+    results = mockResults();
+    var subtree = results.tests['foo'] = {}
+    subtree['bar.html'] = mockExpectation('TEXT', 'PASS');
+    subtree['crash.html'] = mockExpectation('IMAGE', 'CRASH');
+    subtree['flaky-fail.html'] = mockExpectation('PASS TEXT', 'IMAGE PASS');
+    runTest(results, function() {
+        assertTrue(!document.getElementById('results-table'));
+
+        var resultText = document.body.textContent;
+        assertTrue(resultText.indexOf('crash.html') != -1);
+        assertTrue(resultText.indexOf('flaky-fail.html') != -1);
+        assertTrue(resultText.indexOf('crash.html') < resultText.indexOf('flaky-fail.html'));
+    });
+
     document.body.innerHTML = '<pre>' + g_log.join('\n') + '</pre>';
 }
 

Modified: trunk/LayoutTests/fast/harness/results-expected.txt (97521 => 97522)


--- trunk/LayoutTests/fast/harness/results-expected.txt	2011-10-14 22:37:16 UTC (rev 97521)
+++ trunk/LayoutTests/fast/harness/results-expected.txt	2011-10-14 22:40:22 UTC (rev 97522)
@@ -151,3 +151,7 @@
 TEST-31: PASS
 TEST-31: PASS
 TEST-31: PASS
+TEST-32: PASS
+TEST-32: PASS
+TEST-32: PASS
+TEST-32: PASS

Modified: trunk/LayoutTests/fast/harness/results.html (97521 => 97522)


--- trunk/LayoutTests/fast/harness/results.html	2011-10-14 22:37:16 UTC (rev 97521)
+++ trunk/LayoutTests/fast/harness/results.html	2011-10-14 22:40:22 UTC (rev 97522)
@@ -1030,15 +1030,15 @@
     if (globalState().results.interrupted)
         html += "<p class='stopped-running-early-message'>Testing exited early.</p>"
 
+    if (globalState().crashTests.length)
+        html += testList(globalState().crashTests, 'Tests that crashed', 'crash-tests-table');
+
     html += failingTestsTable(globalState().nonFlakyFailingTests,
         'Tests where results did not match expected results', 'results-table');
 
     html += failingTestsTable(globalState().flakyTests,
         'Flaky tests (failed the first run and got a different result on retry)', 'flaky-tests-table');
 
-    if (globalState().crashTests.length)
-        html += testList(globalState().crashTests, 'Tests that crashed', 'crash-tests-table');
-
     if (globalState().timeoutTests.length)
         html += testList(globalState().timeoutTests, 'Tests that timed out', 'timeout-tests-table');
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to