Results: move from status to process

buildbot · Oct 2, 2015 · 4bfd543 · 4bfd543
1 parent 54bf1f1
commit 4bfd543
Show file tree

Hide file tree

Showing 88 changed files with 239 additions and 235 deletions.
diff --git a/master/buildbot/data/buildrequests.py b/master/buildbot/data/buildrequests.py
@@ -18,7 +18,7 @@
 from buildbot.db.buildrequests import AlreadyClaimedError
 
 from buildbot.db.buildrequests import NotClaimedError
-from buildbot.status import results
+from buildbot.process import results
 
 from twisted.internet import defer
 from twisted.internet import reactor

diff --git a/master/buildbot/data/buildsets.py b/master/buildbot/data/buildsets.py
@@ -21,8 +21,8 @@
 from buildbot.data import sourcestamps as sourcestampsapi
 from buildbot.data import types
 from buildbot.process.buildrequest import BuildRequestCollapser
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import worst_status
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import worst_status
 from buildbot.util import datetime2epoch
 from buildbot.util import epoch2datetime
 from twisted.internet import defer

diff --git a/master/buildbot/data/masters.py b/master/buildbot/data/masters.py
@@ -16,7 +16,7 @@
 from buildbot.data import base
 from buildbot.data import resultspec
 from buildbot.data import types
-from buildbot.status.results import RETRY
+from buildbot.process.results import RETRY
 from buildbot.util import epoch2datetime
 from twisted.internet import defer
 from twisted.internet import reactor

diff --git a/master/buildbot/process/build.py b/master/buildbot/process/build.py
@@ -25,15 +25,15 @@
 from buildbot import interfaces
 from buildbot.process import metrics
 from buildbot.process import properties
-from buildbot.status.builder import Results
-from buildbot.status.results import CANCELLED
-from buildbot.status.results import EXCEPTION
-from buildbot.status.results import FAILURE
-from buildbot.status.results import RETRY
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
-from buildbot.status.results import computeResultAndTermination
-from buildbot.status.results import worst_status
+from buildbot.process.results import Results
+from buildbot.process.results import CANCELLED
+from buildbot.process.results import EXCEPTION
+from buildbot.process.results import FAILURE
+from buildbot.process.results import RETRY
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
+from buildbot.process.results import computeResultAndTermination
+from buildbot.process.results import worst_status
 from buildbot.util.eventual import eventually
 
 
@@ -538,7 +538,7 @@ def buildFinished(self, text, results):
         state.
 
         It takes two arguments which describe the overall build status:
-        text, results. 'results' is one of the possible results (see buildbot.status.results).
+        text, results. 'results' is one of the possible results (see buildbot.process.results).
 
         If 'results' is SUCCESS or WARNINGS, we will permit any dependant
         builds to start. If it is 'FAILURE', those builds will be

diff --git a/master/buildbot/process/buildrequest.py b/master/buildbot/process/buildrequest.py
@@ -19,7 +19,7 @@
 
 from buildbot.data import resultspec
 from buildbot.process import properties
-from buildbot.status.results import SKIPPED
+from buildbot.process.results import SKIPPED
 from twisted.internet import defer
 
 

diff --git a/master/buildbot/process/buildstep.py b/master/buildbot/process/buildstep.py
@@ -43,16 +43,16 @@
 from buildbot.process import logobserver
 from buildbot.process import properties
 from buildbot.process import remotecommand
-from buildbot.status import results
-from buildbot.status.results import CANCELLED
-from buildbot.status.results import EXCEPTION
-from buildbot.status.results import FAILURE
-from buildbot.status.results import RETRY
-from buildbot.status.results import Results
-from buildbot.status.results import SKIPPED
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
-from buildbot.status.results import worst_status
+from buildbot.process import results
+from buildbot.process.results import CANCELLED
+from buildbot.process.results import EXCEPTION
+from buildbot.process.results import FAILURE
+from buildbot.process.results import RETRY
+from buildbot.process.results import Results
+from buildbot.process.results import SKIPPED
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
+from buildbot.process.results import worst_status
 from buildbot.util import debounce
 from buildbot.util import flatten
 

diff --git a/master/buildbot/process/remotecommand.py b/master/buildbot/process/remotecommand.py
@@ -18,8 +18,8 @@
 from buildbot import util
 from buildbot.buildslave.protocols import base
 from buildbot.process import metrics
-from buildbot.status.results import FAILURE
-from buildbot.status.results import SUCCESS
+from buildbot.process.results import FAILURE
+from buildbot.process.results import SUCCESS
 from buildbot.util.eventual import eventually
 from twisted.internet import defer
 from twisted.internet import error

diff --git a/master/buildbot/status/results.py → master/buildbot/process/results.py b/master/buildbot/status/results.py → master/buildbot/process/results.py
diff --git a/master/buildbot/reporters/gerrit.py b/master/buildbot/reporters/gerrit.py
@@ -24,12 +24,12 @@
 import warnings
 
 from buildbot.reporters import utils
-from buildbot.status.results import EXCEPTION
-from buildbot.status.results import FAILURE
-from buildbot.status.results import RETRY
-from buildbot.status.results import Results
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
+from buildbot.process.results import EXCEPTION
+from buildbot.process.results import FAILURE
+from buildbot.process.results import RETRY
+from buildbot.process.results import Results
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
 from buildbot.util import service
 
 

diff --git a/master/buildbot/reporters/mail.py b/master/buildbot/reporters/mail.py
@@ -44,12 +44,12 @@
 from buildbot.process.properties import Properties
 from buildbot.reporters import utils
 from buildbot.reporters.message import MessageFormatter as DefaultMessageFormatter
-from buildbot.status.results import CANCELLED
-from buildbot.status.results import EXCEPTION
-from buildbot.status.results import FAILURE
-from buildbot.status.results import Results
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
+from buildbot.process.results import CANCELLED
+from buildbot.process.results import EXCEPTION
+from buildbot.process.results import FAILURE
+from buildbot.process.results import Results
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
 from buildbot.util import service
 
 # Email parsing can be complex. We try to take a very liberal

diff --git a/master/buildbot/reporters/message.py b/master/buildbot/reporters/message.py
@@ -2,12 +2,12 @@
 import os
 
 from buildbot.reporters import utils
-from buildbot.status.results import CANCELLED
-from buildbot.status.results import EXCEPTION
-from buildbot.status.results import FAILURE
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
-from buildbot.status.results import statusToString
+from buildbot.process.results import CANCELLED
+from buildbot.process.results import EXCEPTION
+from buildbot.process.results import FAILURE
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
+from buildbot.process.results import statusToString
 
 
 class MessageFormatter(object):

diff --git a/master/buildbot/reporters/utils.py b/master/buildbot/reporters/utils.py
@@ -15,7 +15,7 @@
 
 from UserList import UserList
 from buildbot.data import resultspec
-from buildbot.status.results import RETRY
+from buildbot.process.results import RETRY
 from buildbot.util import flatten
 from twisted.internet import defer
 

diff --git a/master/buildbot/schedulers/dependent.py b/master/buildbot/schedulers/dependent.py
@@ -17,8 +17,8 @@
 from buildbot import interfaces
 from buildbot import util
 from buildbot.schedulers import base
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
 from twisted.internet import defer
 
 

diff --git a/master/buildbot/status/builder.py b/master/buildbot/status/builder.py
@@ -31,15 +31,15 @@
 from zope.interface import implements
 
 # user modules expect these symbols to be present here
-from buildbot.status.results import CANCELLED
-from buildbot.status.results import EXCEPTION
-from buildbot.status.results import FAILURE
-from buildbot.status.results import RETRY
-from buildbot.status.results import Results
-from buildbot.status.results import SKIPPED
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
-from buildbot.status.results import worst_status
+from buildbot.process.results import CANCELLED
+from buildbot.process.results import EXCEPTION
+from buildbot.process.results import FAILURE
+from buildbot.process.results import RETRY
+from buildbot.process.results import Results
+from buildbot.process.results import SKIPPED
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
+from buildbot.process.results import worst_status
 _hush_pyflakes = [SUCCESS, WARNINGS, FAILURE, SKIPPED,
                   EXCEPTION, RETRY, CANCELLED, Results, worst_status]
 

diff --git a/master/buildbot/status/words.py b/master/buildbot/status/words.py
@@ -33,12 +33,12 @@
 from buildbot.data import resultspec
 from buildbot.process.properties import Properties
 from buildbot.status import base
-from buildbot.status.results import CANCELLED
-from buildbot.status.results import EXCEPTION
-from buildbot.status.results import FAILURE
-from buildbot.status.results import RETRY
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
+from buildbot.process.results import CANCELLED
+from buildbot.process.results import EXCEPTION
+from buildbot.process.results import FAILURE
+from buildbot.process.results import RETRY
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
 
 # Used in command_HELLO and it's test. 'Hi' in 100 languages.
 

diff --git a/master/buildbot/steps/cppcheck.py b/master/buildbot/steps/cppcheck.py
@@ -16,9 +16,9 @@
 import re
 
 from buildbot.process import logobserver
-from buildbot.status.results import FAILURE
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
+from buildbot.process.results import FAILURE
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
 from buildbot.steps.shell import ShellCommand
 
 

diff --git a/master/buildbot/steps/maxq.py b/master/buildbot/steps/maxq.py
@@ -15,8 +15,8 @@
 
 from buildbot import config
 from buildbot.process import buildstep
-from buildbot.status.results import FAILURE
-from buildbot.status.results import SUCCESS
+from buildbot.process.results import FAILURE
+from buildbot.process.results import SUCCESS
 from buildbot.steps.shell import ShellCommand
 
 

diff --git a/master/buildbot/steps/mswin.py b/master/buildbot/steps/mswin.py
@@ -15,10 +15,10 @@
 
 from twisted.python import log
 
-from buildbot.status.results import EXCEPTION
-from buildbot.status.results import FAILURE
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
+from buildbot.process.results import EXCEPTION
+from buildbot.process.results import FAILURE
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
 from buildbot.steps.shell import ShellCommand
 
 

diff --git a/master/buildbot/steps/package/deb/lintian.py b/master/buildbot/steps/package/deb/lintian.py
@@ -19,9 +19,9 @@
 
 from buildbot import config
 from buildbot.process import buildstep
-from buildbot.status.results import FAILURE
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
+from buildbot.process.results import FAILURE
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
 from buildbot.steps.package import util as pkgutil
 from buildbot.steps.shell import ShellCommand
 

diff --git a/master/buildbot/steps/python.py b/master/buildbot/steps/python.py
@@ -19,9 +19,9 @@
 
 from buildbot import config
 from buildbot.process import logobserver
-from buildbot.status.results import FAILURE
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
+from buildbot.process.results import FAILURE
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
 from buildbot.steps.shell import ShellCommand
 
 

diff --git a/master/buildbot/steps/python_twisted.py b/master/buildbot/steps/python_twisted.py
@@ -17,10 +17,10 @@
 from twisted.python import log
 
 from buildbot.process import logobserver
-from buildbot.status.results import FAILURE
-from buildbot.status.results import SKIPPED
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
+from buildbot.process.results import FAILURE
+from buildbot.process.results import SKIPPED
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
 from buildbot.steps.shell import ShellCommand
 
 import re

diff --git a/master/buildbot/steps/shell.py b/master/buildbot/steps/shell.py
@@ -21,10 +21,10 @@
 from buildbot.process import buildstep
 from buildbot.process import logobserver
 from buildbot.process import remotecommand
-from buildbot.status.results import FAILURE
-from buildbot.status.results import Results
-from buildbot.status.results import SUCCESS
-from buildbot.status.results import WARNINGS
+from buildbot.process.results import FAILURE
+from buildbot.process.results import Results
+from buildbot.process.results import SUCCESS
+from buildbot.process.results import WARNINGS
 from buildbot.steps.slave import CompositeStepMixin
 from buildbot.util import command_to_string
 from buildbot.util import flatten

diff --git a/master/buildbot/steps/shellsequence.py b/master/buildbot/steps/shellsequence.py
@@ -16,7 +16,7 @@
 
 from buildbot import config
 from buildbot.process import buildstep
-from buildbot.status import results
+from buildbot.process import results
 from twisted.internet import defer
 from twisted.python import log
 

diff --git a/master/buildbot/steps/slave.py b/master/buildbot/steps/slave.py
@@ -18,8 +18,8 @@
 from buildbot.process import buildstep
 from buildbot.process import remotecommand
 from buildbot.process import remotetransfer
-from buildbot.status.results import FAILURE
-from buildbot.status.results import SUCCESS
+from buildbot.process.results import FAILURE
+from buildbot.process.results import SUCCESS
 
 
 class SlaveBuildStep(buildstep.BuildStep):

diff --git a/master/buildbot/steps/source/darcs.py b/master/buildbot/steps/source/darcs.py
@@ -24,7 +24,7 @@
 from buildbot.process import buildstep
 from buildbot.process import remotecommand
 from buildbot.process import remotetransfer
-from buildbot.status.results import SUCCESS
+from buildbot.process.results import SUCCESS
 from buildbot.steps.source.base import Source
 
 

diff --git a/master/buildbot/steps/source/mercurial.py b/master/buildbot/steps/source/mercurial.py
@@ -23,7 +23,7 @@
 from buildbot.interfaces import BuildSlaveTooOldError
 from buildbot.process import buildstep
 from buildbot.process import remotecommand
-from buildbot.status.results import SUCCESS
+from buildbot.process.results import SUCCESS
 from buildbot.steps.source.base import Source
 
 

diff --git a/master/buildbot/steps/source/mtn.py b/master/buildbot/steps/source/mtn.py
@@ -23,7 +23,7 @@
 from buildbot.interfaces import BuildSlaveTooOldError
 from buildbot.process import buildstep
 from buildbot.process import remotecommand
-from buildbot.status.results import SUCCESS
+from buildbot.process.results import SUCCESS
 from buildbot.steps.source.base import Source
 
 

diff --git a/master/buildbot/steps/subunit.py b/master/buildbot/steps/subunit.py
@@ -16,8 +16,8 @@
 
 from StringIO import StringIO
 from buildbot.process import logobserver
-from buildbot.status.results import FAILURE
-from buildbot.status.results import SUCCESS
+from buildbot.process.results import FAILURE
+from buildbot.process.results import SUCCESS
 from buildbot.steps.shell import ShellCommand
 from unittest import TestResult
 

diff --git a/master/buildbot/steps/trigger.py b/master/buildbot/steps/trigger.py
@@ -23,8 +23,8 @@
 from buildbot.process.buildstep import SUCCESS
 from buildbot.process.properties import Properties
 from buildbot.process.properties import Property
-from buildbot.status.results import statusToString
-from buildbot.status.results import worst_status
+from buildbot.process.results import statusToString
+from buildbot.process.results import worst_status
 from twisted.internet import defer
 from twisted.python import log