Modified: trunk/Tools/ChangeLog (137598 => 137599)
--- trunk/Tools/ChangeLog 2012-12-13 16:26:38 UTC (rev 137598)
+++ trunk/Tools/ChangeLog 2012-12-13 17:08:45 UTC (rev 137599)
@@ -1,3 +1,17 @@
+2012-12-13 Julie Parent <[email protected]>
+
+ Loader_unittests should reset state between runs.
+ https://bugs.webkit.org/show_bug.cgi?id=104862
+
+ Reviewed by Dirk Pranke.
+
+ The loader_unittests were not resetting state between runs, leaving
+ a lot of data behind in global objects that the dashboard and tests
+ rely on. A handful were resetting just a few objects. Use the common
+ resetGlobals() method instead.
+
+ * TestResultServer/static-dashboards/loader_unittests.js:
+
2012-12-13 Andras Becsi <[email protected]>
[Qt][WK2] Fix painting on Mac with retina display
Modified: trunk/Tools/TestResultServer/static-dashboards/loader_unittests.js (137598 => 137599)
--- trunk/Tools/TestResultServer/static-dashboards/loader_unittests.js 2012-12-13 16:26:38 UTC (rev 137598)
+++ trunk/Tools/TestResultServer/static-dashboards/loader_unittests.js 2012-12-13 17:08:45 UTC (rev 137599)
@@ -29,6 +29,7 @@
module('loader');
test('loading steps', 1, function() {
+ resetGlobals();
var loadedSteps = [];
var resourceLoader = new loader.Loader();
function loadingStep1() {
@@ -54,6 +55,7 @@
});
test('results files loading', 5, function() {
+ resetGlobals();
var expectedLoadedBuilders = ["WebKit Linux", "WebKit Win"];
var loadedBuilders = [];
var resourceLoader = new loader.Loader();
@@ -80,13 +82,13 @@
try {
resourceLoader._loadResultsFiles();
} finally {
- g_builders = undefined;
- g_resultsByBuilder = {};
loader.request = requestFunction;
}
});
test('expectations files loading', 1, function() {
+ resetGlobals();
+ parseCrossDashboardParameters();
var expectedLoadedPlatforms = ["chromium", "chromium-android", "efl", "efl-wk1", "efl-wk2", "gtk",
"gtk-wk2", "mac", "mac-lion", "mac-snowleopard", "qt", "win", "wk2"];
var loadedPlatforms = [];
@@ -109,9 +111,9 @@
});
test('results file failing to load', 2, function() {
+ resetGlobals();
// FIXME: loader shouldn't depend on state defined in dashboard_base.js.
g_buildersThatFailedToLoad = [];
- g_builders = {};
var resourceLoader = new loader.Loader();
var resourceLoadCount = 0;
