Skip to content

GitLab

T
tangled
Commit f4701ffc authored by ojan@chromium.org's avatar ojan@chromium.org
Browse files
Options

Green the garden-o-matic unittests. 

Also fixes a real bug where we reversed the order of the
type/release/debug columns for the list of failing builders,
but we didn't adjust cellByBuildType or the tests to account
for it. Instead, re-reverse the order. Tests pass, bug fixed.
I'm not sure when this bug got introduced, but its at least
from before the Blink fork, as are most of these other test
failures.

NOTRY=true

Review URL: https://codereview.chromium.org/332073002

git-svn-id: svn://svn.chromium.org/blink/trunk@176161 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent a81b438b
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 60 deletions
third_party/WebKit/Tools/GardeningServer/scripts/checkout_unittests.js
View file @ f4701ffc
......@@ -122,7 +122,7 @@ asyncTest("rebaseline", 3, function() {
});
});
asyncTest("rebaseline-debug-bot", 3, function() {
asyncTest("rebaseline-debug-bot", 4, function() {
var simulator = new NetworkSimulator();
simulator.post = function(url, body)
{
......@@ -139,7 +139,7 @@ asyncTest("rebaseline-debug-bot", 3, function() {
'testName': 'another/test.svg',
'failureTypeList': ['IMAGE'],
}], function(failureInfo) {
ok(false);
ok(true);
}, function(failureInfo) {
ok(true);
}).then(function() {
......
third_party/WebKit/Tools/GardeningServer/scripts/ui/failures.js
View file @ f4701ffc
......@@ -57,7 +57,7 @@ ui.failures.Builder = base.extends('a', {
},
equals: function(configuration)
{
return this._configuration && this._configuration.is64bit == configuration.is64bit && this._configuration.version == configuration.version;
return this._configuration && this._configuration.is64bit == configuration.is64bit && this._configuration.version == configuration.version;
}
});
......@@ -78,9 +78,9 @@ ui.failures.FailureGrid = base.extends('table', {
{
this.className = 'failures';
var titles = this.createTHead().insertRow();
titles.insertCell().textContent = 'debug';
titles.insertCell().textContent = 'release';
titles.insertCell().textContent = 'type';
titles.insertCell().textContent = 'release';
titles.insertCell().textContent = 'debug';
this._body = this.appendChild(document.createElement('tbody'));
this._reset();
},
......@@ -93,10 +93,10 @@ ui.failures.FailureGrid = base.extends('table', {
row = this._resultRows[result] = this._body.insertRow(0);
row.className = result;
row.insertCell();
row.insertCell();
var titleCell = row.insertCell();
titleCell.appendChild(document.createElement('span')).textContent = result;
row.insertCell();
row.insertCell();
return row;
},
update: function(resultsByBuilder)
......
third_party/WebKit/Tools/GardeningServer/scripts/ui/notifications_unittests.js
View file @ f4701ffc
......@@ -78,7 +78,7 @@ test('SuspiciousCommit', 2, function() {
'</div>');
});
test('FailingTestsSummary', 12, function() {
test('FailingTestsSummary', 10, function() {
var testFailures = new ui.notifications.FailingTestsSummary();
equal(testFailures.tagName, 'LI');
equal(testFailures.innerHTML,
......
third_party/WebKit/Tools/GardeningServer/scripts/ui_unittests.js
View file @ f4701ffc
......@@ -72,6 +72,7 @@ test("ui.onebar", 3, function() {
$(onebar).detach();
});
// FIXME: These three results.* tests should be moved ot ui/results_unittests.js.
test("results.ResultsGrid", 1, function() {
var grid = new ui.results.ResultsGrid()
grid.addResults([
......@@ -81,38 +82,42 @@ test("results.ResultsGrid", 1, function() {
'http://example.com/layout-test-results/foo-bar-diff.png',
]);
equal(grid.innerHTML,
'<table class="comparison">' +
'<thead>' +
'<tr>' +
'<th>Expected</th>' +
'<th>Actual</th>' +
'<th>Diff</th>' +
'</tr>' +
'</thead>' +
'<tbody>' +
'<tr>' +
'<td class="expected result-container"><img class="image-result" src="http://example.com/layout-test-results/foo-bar-expected.png"></td>' +
'<td class="actual result-container"><img class="image-result" src="http://example.com/layout-test-results/foo-bar-actual.png"></td>' +
'<td class="diff result-container"><img class="image-result" src="http://example.com/layout-test-results/foo-bar-diff.png"></td>' +
'</tr>' +
'</tbody>' +
'</table>' +
'<table class="comparison">' +
'<thead>' +
'<tr>' +
'<th>Expected</th>' +
'<th>Actual</th>' +
'<th>Diff</th>' +
'</tr>' +
'</thead>' +
'<tbody>' +
'<tr>' +
'<td class="expected result-container"></td>' +
'<td class="actual result-container"></td>' +
'<td class="diff result-container"><iframe class="text-result" src="http://example.com/layout-test-results/foo-bar-diff.txt"></iframe></td>' +
'</tr>' +
'</tbody>' +
'</table>');
'<div class="comparison">' +
'<div>' +
'<h2>Expected</h2>' +
'<div class="results-container expected">' +
'<img class="image-result" src="http://example.com/layout-test-results/foo-bar-expected.png">' +
'</div>' +
'</div>' +
'<div>' +
'<h2>Actual</h2>' +
'<div class="results-container actual">' +
'<img class="image-result" src="http://example.com/layout-test-results/foo-bar-actual.png">' +
'</div>' +
'</div>' +
'<div>' +
'<h2>Diff</h2>' +
'<div class="results-container diff">' +
'<img class="image-result" src="http://example.com/layout-test-results/foo-bar-diff.png">' +
'</div>' +
'</div>' +
'</div>' +
'<div class="comparison">' +
'<div>' +
'<h2>Expected</h2>' +
'<div class="results-container expected"></div>' +
'</div>' +
'<div>' +
'<h2>Actual</h2>' +
'<div class="results-container actual"></div>' +
'</div>' +
'<div>' +
'<h2>Diff</h2>' +
'<div class="results-container diff">' +
'<iframe class="text-result" src="http://example.com/layout-test-results/foo-bar-diff.txt"></iframe>' +
'</div>' +
'</div>' +
'</div>');
});
test("results.ResultsGrid (crashlog)", 1, function() {
......@@ -134,12 +139,15 @@ test("StatusArea", 3, function() {
statusArea.addMessage(id, 'Second Message');
equal(statusArea.outerHTML,
'<div class="status processing" style="visibility: visible;">' +
'<div class="dragger"></div>' +
'<div class="contents">' +
'<div id="status-content-1" class="status-content">' +
'<div class="message">First Message</div>' +
'<div class="message">Second Message</div>' +
'</div>' +
'</div>' +
'<ul class="actions"><li><button class="action">Close</button></li></ul>' +
'<progress class="process-text">Processing...</progress>' +
'<div id="status-content-1" class="status-content">' +
'<div class="message">First Message</div>' +
'<div class="message">Second Message</div>' +
'</div>' +
'</div>');
var secondStatusArea = new ui.StatusArea();
......@@ -148,15 +156,18 @@ test("StatusArea", 3, function() {
equal(statusArea.outerHTML,
'<div class="status processing" style="visibility: visible;">' +
'<div class="dragger"></div>' +
'<div class="contents">' +
'<div id="status-content-1" class="status-content">' +
'<div class="message">First Message</div>' +
'<div class="message">Second Message</div>' +
'</div>' +
'<div id="status-content-2" class="status-content">' +
'<div class="message">First Message second id</div>' +
'</div>' +
'</div>' +
'<ul class="actions"><li><button class="action">Close</button></li></ul>' +
'<progress class="process-text">Processing...</progress>' +
'<div id="status-content-1" class="status-content">' +
'<div class="message">First Message</div>' +
'<div class="message">Second Message</div>' +
'</div>' +
'<div id="status-content-2" class="status-content">' +
'<div class="message">First Message second id</div>' +
'</div>' +
'</div>');
statusArea.addFinalMessage(id, 'Final Message 1');
......@@ -164,17 +175,20 @@ test("StatusArea", 3, function() {
equal(statusArea.outerHTML,
'<div class="status" style="visibility: visible;">' +
'<div class="dragger"></div>' +
'<div class="contents">' +
'<div id="status-content-1" class="status-content">' +
'<div class="message">First Message</div>' +
'<div class="message">Second Message</div>' +
'<div class="message">Final Message 1</div>' +
'</div>' +
'<div id="status-content-2" class="status-content">' +
'<div class="message">First Message second id</div>' +
'<div class="message">Final Message 2</div>' +
'</div>' +
'</div>' +
'<ul class="actions"><li><button class="action">Close</button></li></ul>' +
'<progress class="process-text">Processing...</progress>' +
'<div id="status-content-1" class="status-content">' +
'<div class="message">First Message</div>' +
'<div class="message">Second Message</div>' +
'<div class="message">Final Message 1</div>' +
'</div>' +
'<div id="status-content-2" class="status-content">' +
'<div class="message">First Message second id</div>' +
'<div class="message">Final Message 2</div>' +
'</div>' +
'</div>');
statusArea.close();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment