Move ExtractTestResults[AndLeaks]'s summarizing code back from commandComplete() to finished()

commandComplete() is never called for MasterShellCommands like ExtractTestResults[AndLeaks].
(Unfortunately the buildbot documentation does not make this clear.) finished() is the only
hook we have, so we have to do our work there. I added a new addCustomURLs method which can
be overridden by subclasses to provide extra URLs before we call up to the base class (after
which adding more URLs is no longer possible).

Really hopefully fixes <http://webkit.org/b/56032> Leaks viewer should be linked from leaks
bot results page

Reviewed by John Sullivan.

* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(ExtractTestResults.addCustomURLs): Moved code to add the "view results" URL here...
(ExtractTestResults.finished): ...from here. This replaces commandComplete, since that
method is never called for MasterShellCommands.
(ExtractTestResultsAndLeaks.addCustomURLs): Replaced commandComplete (which is never called)
with this method (which is).

git-svn-id: svn://svn.chromium.org/blink/trunk@83170 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

@@ -415,15 +415,18 @@ class ExtractTestResults(master.MasterShellCommand):
         self.command = ["ditto", "-k", "-x", "-V", self.build.getProperties().render(self.zipFile), self.build.getProperties().render(self.resultDirectory)]
         return master.MasterShellCommand.start(self)
 
-    def commandComplete(self, cmd):
-        shell.Test.commandComplete(self, cmd)
+    def addCustomURLs(self):
         url = self.resultDirectoryURL() + "results.html"
         self.addURL("view results", url)
 
+    def finished(self, result):
+        self.addCustomURLs()
+        return master.MasterShellCommand.finished(self, result)
+
 
 class ExtractTestResultsAndLeaks(ExtractTestResults):
-    def commandComplete(self, cmd):
-        ExtractTestResults.commandComplete(self, cmd)
+    def addCustomURLs(self):
+        ExtractTestResults.addCustomURLs(self)
         url = "/LeaksViewer/?url=" + urllib.quote(self.resultDirectoryURL(), safe="")
         self.addURL("view leaks", url)
 

third_party/WebKit/Tools/ChangeLog

+2011-04-07  Adam Roben  <aroben@apple.com>
+
+        Move ExtractTestResults[AndLeaks]'s summarizing code back from commandComplete() to finished()
+
+        commandComplete() is never called for MasterShellCommands like ExtractTestResults[AndLeaks].
+        (Unfortunately the buildbot documentation does not make this clear.) finished() is the only
+        hook we have, so we have to do our work there. I added a new addCustomURLs method which can
+        be overridden by subclasses to provide extra URLs before we call up to the base class (after
+        which adding more URLs is no longer possible).
+
+        Really hopefully fixes <http://webkit.org/b/56032> Leaks viewer should be linked from leaks
+        bot results page
+
+        Reviewed by John Sullivan.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (ExtractTestResults.addCustomURLs): Moved code to add the "view results" URL here...
+        (ExtractTestResults.finished): ...from here. This replaces commandComplete, since that
+        method is never called for MasterShellCommands.
+        (ExtractTestResultsAndLeaks.addCustomURLs): Replaced commandComplete (which is never called)
+        with this method (which is).
+
 2011-04-07  Adam Roben  <aroben@apple.com>
 
         Move ExtractTestResults[AndLeaks]'s summarizing code from finished() to commandComplete()