Skip to content

Commit

Permalink
Remove calls to BuildStep.addFactoryArguments.
Browse files Browse the repository at this point in the history 
This call does nothing anymore, so remove calls to it. The function is still
around for backwards compatibility.
  • Loading branch information
@tomprince
tomprince committed Mar 31, 2012
1 parent a8f8877 commit a77e511
Show file tree
Hide file tree
Showing 20 changed files with 0 additions and 246 deletions.
3 changes: 0 additions & 3 deletions master/buildbot/process/buildstep.py
View file
Expand Up @@ -761,9 +761,6 @@ class LoggingBuildStep(BuildStep):
def __init__(self, logfiles={}, lazylogfiles=False, log_eval_func=None,
*args, **kwargs):
BuildStep.__init__(self, *args, **kwargs)
self.addFactoryArguments(logfiles=logfiles,
lazylogfiles=lazylogfiles,
log_eval_func=log_eval_func)

if logfiles and not isinstance(logfiles, dict):
config.error(
Expand Down
9 changes: 0 additions & 9 deletions master/buildbot/process/mtrlogobserver.py
View file
Expand Up @@ -296,15 +296,6 @@ def __init__(self, dbpool=None, test_type=None, test_info="",
self.mtr_subdir = mtr_subdir
self.progressMetrics += ('tests',)

self.addFactoryArguments(dbpool=self.dbpool,
test_type=self.test_type,
test_info=self.test_info,
autoCreateTables=self.autoCreateTables,
textLimit=self.textLimit,
testNameLimit=self.testNameLimit,
parallel=self.parallel,
mtr_subdir=self.mtr_subdir)

def start(self):
# Add mysql server logfiles.
for mtr in range(0, self.parallel+1):
Expand Down
4 changes: 0 additions & 4 deletions master/buildbot/steps/master.py
View file
Expand Up @@ -38,10 +38,6 @@ def __init__(self, command,
env=None, path=None, usePTY=0,
**kwargs):
BuildStep.__init__(self, **kwargs)
self.addFactoryArguments(description=description,
descriptionDone=descriptionDone,
env=env, path=path, usePTY=usePTY,
command=command)

self.command=command
if description:
Expand Down
1 change: 0 additions & 1 deletion master/buildbot/steps/maxq.py
View file
Expand Up @@ -26,7 +26,6 @@ def __init__(self, testdir=None, **kwargs):
config.error("please pass testdir")
kwargs['command'] = 'run_maxq.py %s' % (testdir,)
ShellCommand.__init__(self, **kwargs)
self.addFactoryArguments(testdir=testdir)

def commandComplete(self, cmd):
output = cmd.logs['stdio'].getText()
Expand Down
10 changes: 0 additions & 10 deletions master/buildbot/steps/package/rpm/rpmbuild.py
View file
Expand Up @@ -41,16 +41,6 @@ def __init__(self,
vcsRevision=False,
**kwargs):
ShellCommand.__init__(self, **kwargs)
self.addFactoryArguments(topdir=topdir,
builddir=builddir,
rpmdir=rpmdir,
sourcedir=sourcedir,
specdir=specdir,
srcrpmdir=srcrpmdir,
specfile=specfile,
dist=dist,
autoRelease=autoRelease,
vcsRevision=vcsRevision)
self.rpmbuild = (
'rpmbuild --define "_topdir %s" --define "_builddir %s"'
' --define "_rpmdir %s" --define "_sourcedir %s"'
Expand Down
11 changes: 0 additions & 11 deletions master/buildbot/steps/python.py
View file
Expand Up @@ -260,17 +260,6 @@ def __init__(self, sphinx_sourcedir='.', sphinx_builddir=None,
command.extend([sphinx_sourcedir, sphinx_builddir])
self.setCommand(command)

self.addFactoryArguments(
sphinx = sphinx,
sphinx_sourcedir = sphinx_sourcedir,
sphinx_builddir = sphinx_builddir,
sphinx_builder = sphinx_builder,
tags = tags,
defines = defines,
mode = mode,
)


def createSummary(self, log):

msgs = ['WARNING', 'ERROR', 'SEVERE']
Expand Down
12 changes: 0 additions & 12 deletions master/buildbot/steps/python_twisted.py
View file
Expand Up @@ -47,7 +47,6 @@ class HLint(ShellCommand):

def __init__(self, python=None, **kwargs):
ShellCommand.__init__(self, **kwargs)
self.addFactoryArguments(python=python)
self.python = python

def start(self):
Expand Down Expand Up @@ -287,17 +286,6 @@ def __init__(self, reactor=UNSPECIFIED, python=None, trial=None,
timeout.
"""
ShellCommand.__init__(self, **kwargs)
self.addFactoryArguments(reactor=reactor,
python=python,
trial=trial,
testpath=testpath,
tests=tests,
testChanges=testChanges,
recurse=recurse,
randomly=randomly,
trialMode=trialMode,
trialArgs=trialArgs,
)

if python:
self.python = python
Expand Down
16 changes: 0 additions & 16 deletions master/buildbot/steps/shell.py
View file
Expand Up @@ -105,17 +105,11 @@ def __init__(self, workdir=None,
buildstep_kwargs[k] = kwargs[k]
del kwargs[k]
buildstep.LoggingBuildStep.__init__(self, **buildstep_kwargs)
self.addFactoryArguments(workdir=workdir,
description=description,
descriptionDone=descriptionDone,
command=command)

# everything left over goes to the RemoteShellCommand
kwargs['workdir'] = workdir # including a copy of 'workdir'
kwargs['usePTY'] = usePTY
self.remote_kwargs = kwargs
# we need to stash the RemoteShellCommand's args too
self.addFactoryArguments(**kwargs)

def setBuild(self, build):
buildstep.LoggingBuildStep.setBuild(self, build)
Expand Down Expand Up @@ -303,10 +297,6 @@ def __init__(self, property=None, extract_fn=None, strip=True, **kwargs):

ShellCommand.__init__(self, **kwargs)

self.addFactoryArguments(property=self.property)
self.addFactoryArguments(extract_fn=self.extract_fn)
self.addFactoryArguments(strip=self.strip)

self.property_changes = {}

def commandComplete(self, cmd):
Expand Down Expand Up @@ -405,12 +395,6 @@ def __init__(self,
# And upcall to let the base class do its work
ShellCommand.__init__(self, **kwargs)

self.addFactoryArguments(warningPattern=warningPattern,
directoryEnterPattern=directoryEnterPattern,
directoryLeavePattern=directoryLeavePattern,
warningExtractor=warningExtractor,
maxWarnCount=maxWarnCount,
suppressionFile=suppressionFile)
self.suppressions = []
self.directoryStack = []

Expand Down
5 changes: 0 additions & 5 deletions master/buildbot/steps/slave.py
View file
Expand Up @@ -30,8 +30,6 @@ class SetPropertiesFromEnv(buildstep.BuildStep):

def __init__(self, variables, source="SlaveEnvironment", **kwargs):
buildstep.BuildStep.__init__(self, **kwargs)
self.addFactoryArguments(variables = variables,
source = source)
self.variables = variables
self.source = source

Expand Down Expand Up @@ -74,7 +72,6 @@ class FileExists(buildstep.BuildStep):

def __init__(self, file, **kwargs):
buildstep.BuildStep.__init__(self, **kwargs)
self.addFactoryArguments(file = file)
self.file = file

def start(self):
Expand Down Expand Up @@ -115,7 +112,6 @@ class RemoveDirectory(buildstep.BuildStep):

def __init__(self, dir, **kwargs):
buildstep.BuildStep.__init__(self, **kwargs)
self.addFactoryArguments(dir = dir)
self.dir = dir

def start(self):
Expand Down Expand Up @@ -150,7 +146,6 @@ class MakeDirectory(buildstep.BuildStep):

def __init__(self, dir, **kwargs):
buildstep.BuildStep.__init__(self, **kwargs)
self.addFactoryArguments(dir = dir)
self.dir = dir

def start(self):
Expand Down
10 changes: 0 additions & 10 deletions master/buildbot/steps/source/base.py
View file
Expand Up @@ -130,16 +130,6 @@ def __init__(self, workdir=None, mode='update', alwaysUseLatest=False,
"""

LoggingBuildStep.__init__(self, **kwargs)
self.addFactoryArguments(workdir=workdir,
mode=mode,
alwaysUseLatest=alwaysUseLatest,
timeout=timeout,
retry=retry,
logEnviron=logEnviron,
env=env,
description=description,
descriptionDone=descriptionDone
)

assert mode in ("update", "copy", "clobber", "export")
if retry:
Expand Down
6 changes: 0 additions & 6 deletions master/buildbot/steps/source/bzr.py
View file
Expand Up @@ -34,12 +34,6 @@ def __init__(self, repourl=None, baseURL=None, mode='incremental',
self.mode = mode
self.method = method
Source.__init__(self, **kwargs)
self.addFactoryArguments(repourl=repourl,
mode=mode,
method=method,
baseURL=baseURL,
defaultBranch=defaultBranch,
)
if repourl and baseURL:
raise ValueError("you must provide exactly one of repourl and"
" baseURL")
Expand Down
8 changes: 0 additions & 8 deletions master/buildbot/steps/source/cvs.py
View file
Expand Up @@ -43,14 +43,6 @@ def __init__(self, cvsroot=None, cvsmodule='', mode='incremental',
self.method = method
self.srcdir = 'source'
Source.__init__(self, **kwargs)
self.addFactoryArguments(cvsroot=cvsroot,
cvsmodule=cvsmodule,
mode=mode,
method=method,
global_options=global_options,
extra_options=extra_options,
login=login,
)

def startVC(self, branch, revision, patch):
self.revision = revision
Expand Down
11 changes: 0 additions & 11 deletions master/buildbot/steps/source/git.py
View file
Expand Up @@ -70,17 +70,6 @@ def __init__(self, repourl=None, branch='HEAD', mode='incremental',
self.clobberOnFailure = clobberOnFailure
self.mode = mode
Source.__init__(self, **kwargs)
self.addFactoryArguments(branch=branch,
mode=mode,
method=method,
progress=progress,
repourl=repourl,
submodules=submodules,
shallow=shallow,
retryFetch=retryFetch,
clobberOnFailure=
clobberOnFailure,
)

assert self.mode in ['incremental', 'full']
assert self.repourl is not None
Expand Down
8 changes: 0 additions & 8 deletions master/buildbot/steps/source/mercurial.py
View file
Expand Up @@ -71,14 +71,6 @@ def __init__(self, repourl=None, mode='incremental',
self.clobberOnBranchChange = clobberOnBranchChange
self.mode = mode
Source.__init__(self, **kwargs)
self.addFactoryArguments(repourl=repourl,
mode=mode,
method=method,
defaultBranch=defaultBranch,
branchType=branchType,
clobberOnBranchChange=
clobberOnBranchChange,
)

errors = []
if self.mode not in self.possible_modes:
Expand Down

0 comments on commit a77e511

Please sign in to comment.