rename computeResultAndContinuation to computeResultAndTermination

buildbot · Jan 21, 2014 · d331b90 · d331b90
1 parent 9d96a06
commit d331b90
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/master/buildbot/process/build.py b/master/buildbot/process/build.py
@@ -34,7 +34,7 @@
 from buildbot.status.results import RETRY
 from buildbot.status.results import SUCCESS
 from buildbot.status.results import WARNINGS
-from buildbot.status.results import computeResultAndContinuation
+from buildbot.status.results import computeResultAndTermination
 from buildbot.util.eventual import eventually
 
 
@@ -452,8 +452,8 @@ def stepDone(self, result, step):
         self.results.append(result)
         if text:
             self.text.extend(text)
-        self.result, terminate = computeResultAndContinuation(step, result,
-                                                              self.result)
+        self.result, terminate = computeResultAndTermination(step, result,
+                                                             self.result)
         if not self.conn:
             terminate = True
         return terminate

diff --git a/master/buildbot/status/results.py b/master/buildbot/status/results.py
@@ -25,7 +25,7 @@ def worst_status(a, b):
             return s
 
 
-def computeResultAndContinuation(obj, result, previousResult):
+def computeResultAndTermination(obj, result, previousResult):
     possible_overall_result = result
     terminate = False
     if result == FAILURE:

diff --git a/master/buildbot/steps/shellsequence.py b/master/buildbot/steps/shellsequence.py
@@ -104,7 +104,7 @@ def runShellSequence(self, commands):
 
             cmd = yield self.makeRemoteShellCommand(command=command)
             yield self.runCommand(cmd)
-            overall_result, terminate = results.computeResultAndContinuation(
+            overall_result, terminate = results.computeResultAndTermination(
                 arg, cmd.results(), overall_result)
             if terminate:
                 break

diff --git a/master/buildbot/test/unit/test_status_results.py b/master/buildbot/test/unit/test_status_results.py
@@ -53,7 +53,7 @@ def do_test_carc(self, result, previousResult, newResult, terminate,
                             self.flunkOnFailure = fof
                             self.warnOnWarnings = wow
                             self.warnOnFailure = wof
-                            nr, term = results.computeResultAndContinuation(
+                            nr, term = results.computeResultAndTermination(
                                 self, result, previousResult)
                             log.msg("res=%r prevRes=%r hof=%r fow=%r fof=%r "
                                     "wow=%r wof=%r => %r %r" %

diff --git a/master/docs/developer/results.rst b/master/docs/developer/results.rst
@@ -51,7 +51,7 @@ external tools, so the values are fixed.
     This function takes two status values, and returns the "worst" status of the two.
     This is used to aggregate step statuses into build statuses, and build statuses into buildset statuses.
 
-.. py:function:: computeResultAndContinuation(obj, result, previousResult):
+.. py:function:: computeResultAndTermination(obj, result, previousResult):
 
     :param obj: an object with the attributes of :py:class:`ResultComputingConfigMixin`
     :param result: the new result
@@ -61,7 +61,7 @@ external tools, so the values are fixed.
 
 .. py:class:: ResultComputingConfigMixin
 
-    This simple mixin is intended to help implement classes that will use :py:meth:`computeResultAndContinuation`.
+    This simple mixin is intended to help implement classes that will use :py:meth:`computeResultAndTermination`.
     The class has, as class attributes, the result computing configuration parameters with default values:
 
     ..py:attribute:: haltOnFailure