Modified: trunk/Tools/ChangeLog (119753 => 119754)
--- trunk/Tools/ChangeLog 2012-06-07 21:32:13 UTC (rev 119753)
+++ trunk/Tools/ChangeLog 2012-06-07 21:32:33 UTC (rev 119754)
@@ -1,3 +1,14 @@
+2012-06-07 Ojan Vafai <o...@chromium.org>
+
+ Fix recent null pointer error regression in the flakiness dashboard
+ https://bugs.webkit.org/show_bug.cgi?id=88573
+
+ Reviewed by Dirk Pranke.
+
+ * TestResultServer/static-dashboards/builders.js:
+ (requestBuilderList):
+ * TestResultServer/static-dashboards/flakiness_dashboard_unittests.js:
+
2012-06-07 Konrad Piascik <kpias...@rim.com>
Add Konrad Piascik to committers.py
Modified: trunk/Tools/TestResultServer/static-dashboards/builders.js (119753 => 119754)
--- trunk/Tools/TestResultServer/static-dashboards/builders.js 2012-06-07 21:32:13 UTC (rev 119753)
+++ trunk/Tools/TestResultServer/static-dashboards/builders.js 2012-06-07 21:32:33 UTC (rev 119754)
@@ -117,14 +117,9 @@
});
}
-function requestBuilderList(builderGroups, builderFilter, master, groupName, groupEnum, builderGroup)
+function doXHR(url, onLoad, builderGroups, groupName)
{
- if (!(groupName in builderGroups))
- builderGroups[groupName] = builderGroup;
-
- var _onLoad_ = partial(onBuilderListLoad, builderGroups, builderFilter, master, groupName, groupEnum);
var xhr = new XMLHttpRequest();
- var url = ""
xhr.open('GET', url, true);
xhr._onload_ = function() {
if (xhr.status == 200)
@@ -134,6 +129,14 @@
};
xhr._onerror_ = function() { onErrorLoadingBuilderList(url, builderGroups, groupName); };
xhr.send();
+}
+
+function requestBuilderList(builderGroups, builderFilter, master, groupName, groupEnum, builderGroup)
+{
+ if (!builderGroups[groupName])
+ builderGroups[groupName] = builderGroup;
+ var _onLoad_ = partial(onBuilderListLoad, builderGroups, builderFilter, master, groupName, groupEnum);
+ doXHR(master.builderJsonPath(), onLoad, builderGroups, groupName);
builderGroups[groupName].expectedGroups += 1;
}
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js (119753 => 119754)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js 2012-06-07 21:32:13 UTC (rev 119753)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js 2012-06-07 21:32:33 UTC (rev 119754)
@@ -661,6 +661,26 @@
equal(testBuilderGroups['@ToT - dummy.org'].groups, 3);
});
+test('requestBuilderListAddsBuilderGroupEntry', 2, function() {
+ var testBuilderGroups = { '@ToT - dummy.org': null };
+
+ var oldDoXHR = doXHR;
+ try {
+ doXHR = function() {};
+ var builderFilter = null;
+ var master = { builderJsonPath: function() {} };
+ var groupName = '@ToT - dummy.org';
+ var groupEnum = null;
+ var builderGroup = { expectedGroups: 0 };
+ requestBuilderList(testBuilderGroups, builderFilter, master, groupName, groupEnum, builderGroup);
+
+ equal(testBuilderGroups['@ToT - dummy.org'], builderGroup);
+ equal(testBuilderGroups['@ToT - dummy.org'].expectedGroups, 1);
+ } finally {
+ doXHR = oldDoXHR;
+ }
+})
+
test('sortTests', 4, function() {
var test1 = createResultsObjectForTest('foo/test1.html', 'dummyBuilder');
var test2 = createResultsObjectForTest('foo/test2.html', 'dummyBuilder');
