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

This matches how most of our other build steps work, so is good just for improving
consistency between build steps. It should also make it possible for
ExtractTestResultsAndLeaks to successfully add a URL to Leaks Viewer. (Previously we were
trying to do this in finished() after we had called up to the base class, but that was
apparently too late to add more URLs.)

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): Added a descriptionDone property so that we don't have to manually
call setText to get the right text to show up for this step. This matches how most of our
other build steps work.
(ExtractTestResults.commandComplete): Replaced our override of finished with this function.
This is how most of our other build steps work.
(ExtractTestResultsAndLeaks.commandComplete): Replaced our override of finished with this
function, to match the base class.

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

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

@@ -403,6 +403,7 @@ class UploadTestResults(transfer.FileUpload):
 class ExtractTestResults(master.MasterShellCommand):
     zipFile = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s).zip")
     resultDirectory = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s)")
+    descriptionDone = ["uploaded results"]
 
     def __init__(self):
         master.MasterShellCommand.__init__(self, "")
@@ -414,19 +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 finished(self, result):
+    def commandComplete(self, cmd):
+        shell.Test.commandComplete(self, cmd)
         url = self.resultDirectoryURL() + "results.html"
         self.addURL("view results", url)
-        result = master.MasterShellCommand.finished(self, result)
-        self.step_status.setText(["uploaded results"])
-        return result
+
 
 class ExtractTestResultsAndLeaks(ExtractTestResults):
-    def finished(self, result):
-        result = ExtractTestResults.finished(self, result)
+    def commandComplete(self, cmd):
+        ExtractTestResults.commandComplete(self, cmd)
         url = "/LeaksViewer/?url=" + urllib.quote(self.resultDirectoryURL(), safe="")
         self.addURL("view leaks", url)
-        return result
+
 
 class Factory(factory.BuildFactory):
     def __init__(self, platform, configuration, architectures, buildOnly):

third_party/WebKit/Tools/ChangeLog

+2011-04-07  Adam Roben  <aroben@apple.com>
+
+        Move ExtractTestResults[AndLeaks]'s summarizing code from finished() to commandComplete()
+
+        This matches how most of our other build steps work, so is good just for improving
+        consistency between build steps. It should also make it possible for
+        ExtractTestResultsAndLeaks to successfully add a URL to Leaks Viewer. (Previously we were
+        trying to do this in finished() after we had called up to the base class, but that was
+        apparently too late to add more URLs.)
+
+        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): Added a descriptionDone property so that we don't have to manually
+        call setText to get the right text to show up for this step. This matches how most of our
+        other build steps work.
+        (ExtractTestResults.commandComplete): Replaced our override of finished with this function.
+        This is how most of our other build steps work.
+        (ExtractTestResultsAndLeaks.commandComplete): Replaced our override of finished with this
+        function, to match the base class.
+
 2011-04-07  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Maciej Stachowiak.