Title: [220771] trunk/Tools
- Revision
- 220771
- Author
- [email protected]
- Date
- 2017-08-15 15:58:17 -0700 (Tue, 15 Aug 2017)
Log Message
undefined URL in PopoverTracker for failed step
https://bugs.webkit.org/show_bug.cgi?id=175593
<rdar://problem/33898769>
Reviewed by Daniel Bates.
This fix is a workaround for Buildbot 0.9 bug <https://github.com/buildbot/buildbot/issues/3529> where it
does not provide a URL to stdio for a build step. Buildbot 0.8 always included a URL to the stdio of the step.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
(BuildbotIteration.prototype._parseData): Pass the URL while instantiating BuildbotTestResults.
(BuildbotIteration.prototype._urlForStep): Method to get the URL for a step.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTestResults.js:
(BuildbotTestResults): Accept URL in constructor.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js (220770 => 220771)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2017-08-15 22:54:50 UTC (rev 220770)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2017-08-15 22:58:17 UTC (rev 220771)
@@ -260,7 +260,7 @@
data.steps.forEach(function(step) {
if (!step.complete || step.hidden || !(step.name in BuildbotIteration.TestSteps))
return;
- var results = new BuildbotTestResults(step);
+ var results = new BuildbotTestResults(step, this._stdioURLForStep(step));
if (step.name === "layout-test")
this.layoutTestResults = results;
else if (/(?=.*test)(?=.*jsc)/.test(step.name))
@@ -313,6 +313,21 @@
}
},
+ _stdioURLForStep: function(step)
+ {
+ if (this.queue.buildbot.VERSION_LESS_THAN_09) {
+ try {
+ return step.logs[0][1];
+ } catch (ex) {
+ return;
+ }
+ }
+
+ // FIXME: Update this logic after <https://github.com/buildbot/buildbot/issues/3465> is fixed. Buildbot 0.9 does
+ // not provide a URL to stdio for a build step in the REST API, so we are manually constructing the url here.
+ return this.queue.buildbot.buildPageURLForIteration(this) + "/steps/" + step.number + "/logs/stdio";
+ },
+
// FIXME: Remove this method after https://bugs.webkit.org/show_bug.cgi?id=175056 is fixed.
_adjustBuildDataForBuildbot09: function(data)
{
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTestResults.js (220770 => 220771)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTestResults.js 2017-08-15 22:54:50 UTC (rev 220770)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTestResults.js 2017-08-15 22:58:17 UTC (rev 220771)
@@ -23,9 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-BuildbotTestResults = function(testStep)
+BuildbotTestResults = function(testStep, url)
{
BaseObject.call(this);
+ this.URL = ""
this._parseResults(testStep);
};
@@ -39,11 +40,6 @@
_parseResults: function(testStep)
{
this.name = testStep.name;
- try {
- this.URL = ""
- } catch (ex) {
- }
-
this.allPassed = false;
this.errorOccurred = false;
this.tooManyFailures = false;
Modified: trunk/Tools/ChangeLog (220770 => 220771)
--- trunk/Tools/ChangeLog 2017-08-15 22:54:50 UTC (rev 220770)
+++ trunk/Tools/ChangeLog 2017-08-15 22:58:17 UTC (rev 220771)
@@ -1,3 +1,20 @@
+2017-08-15 Aakash Jain <[email protected]>
+
+ undefined URL in PopoverTracker for failed step
+ https://bugs.webkit.org/show_bug.cgi?id=175593
+ <rdar://problem/33898769>
+
+ Reviewed by Daniel Bates.
+
+ This fix is a workaround for Buildbot 0.9 bug <https://github.com/buildbot/buildbot/issues/3529> where it
+ does not provide a URL to stdio for a build step. Buildbot 0.8 always included a URL to the stdio of the step.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
+ (BuildbotIteration.prototype._parseData): Pass the URL while instantiating BuildbotTestResults.
+ (BuildbotIteration.prototype._urlForStep): Method to get the URL for a step.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTestResults.js:
+ (BuildbotTestResults): Accept URL in constructor.
+
2017-08-14 Simon Fraser <[email protected]>
Remove Proximity Events and related code
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
