Changeset 219963 in webkit

Timestamp:

Jul 26, 2017, 2:38:04 PM (9 years ago)

Author:

aakash_jain@apple.com

Message:

Remove duplicate code from Buildbot.js in dashboard
​https://bugs.webkit.org/show_bug.cgi?id=174870

Reviewed by Daniel Bates.

• BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:

(Buildbot.prototype.javaScriptCoreTestFailuresURLForIteration): Remove duplicate code and reuse buildPageURLForIteration() to construct URL.
(Buildbot.prototype.javaScriptCoreTestStdioUrlForIteration): Ditto.

• BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/resources/MockBuildbot.js:

(MockBuildbot.prototype.javaScriptCoreTestStdioUrlForIteration): Ditto for tests.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js (modified) (1 diff)
• BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/resources/MockBuildbot.js (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js

@@ -154 +154 @@
     javaScriptCoreTestFailuresURLForIteration: function(iteration, name)
     {
-        return this.baseURL + "builders/" + encodeURIComponent(iteration.queue.id) + "/builds/" + iteration.id + "/steps/" + name + "/logs/json/text";
+        return this.buildPageURLForIteration(iteration) + "/steps/" + name + "/logs/json/text";
     },
 
     javaScriptCoreTestStdioUrlForIteration: function(iteration, name)
     {
-        return this.baseURL + "builders/" + encodeURIComponent(iteration.queue.id) + "/builds/" + iteration.id + "/steps/" + name + "/logs/stdio";
+        return this.buildPageURLForIteration(iteration) + "/steps/" + name + "/logs/stdio";
     },
 

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/resources/MockBuildbot.js

@@ -41 +41 @@
     javaScriptCoreTestStdioUrlForIteration: function(iteration, name)
     {
-        return this.baseURL + "builders/" + encodeURIComponent(iteration.queue.id) + "/builds/" + iteration.id + "/steps/" + name + "/logs/stdio";
-
+        return this.buildPageURLForIteration(iteration) + "/steps/" + name + "/logs/stdio";
     },
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2017-07-26  Aakash Jain  <aakash_jain@apple.com>
+
+        Remove duplicate code from Buildbot.js in dashboard
+        https://bugs.webkit.org/show_bug.cgi?id=174870
+
+        Reviewed by Daniel Bates.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
+        (Buildbot.prototype.javaScriptCoreTestFailuresURLForIteration): Remove duplicate code and reuse buildPageURLForIteration() to construct URL.
+        (Buildbot.prototype.javaScriptCoreTestStdioUrlForIteration): Ditto.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/resources/MockBuildbot.js:
+        (MockBuildbot.prototype.javaScriptCoreTestStdioUrlForIteration): Ditto for tests.
+
 2017-07-26  Brady Eidson  <beidson@apple.com>