From cf1d39cea4aebeb2b34e1464a22745fa4409a16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rn=20Lomax?= Date: Mon, 16 Mar 2015 12:10:16 +0100 Subject: [PATCH] Fixes #2676 Be consitent with addXxx or newXxx --- master/buildbot/data/builds.py | 2 +- master/buildbot/data/logs.py | 2 +- master/buildbot/data/steps.py | 2 +- master/buildbot/process/build.py | 2 +- master/buildbot/process/buildstep.py | 8 ++++---- master/buildbot/test/fake/fakedata.py | 6 +++--- .../buildbot/test/integration/test_custom_buildstep.py | 6 +++--- .../test/integration/test_setproperyfromcommand.py | 4 ++-- master/buildbot/test/unit/test_data_builds.py | 8 ++++---- master/buildbot/test/unit/test_data_logs.py | 6 +++--- master/buildbot/test/unit/test_data_steps.py | 8 ++++---- master/buildbot/test/unit/test_process_log.py | 2 +- master/buildbot/test/unit/test_process_logobserver.py | 10 +++++----- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/master/buildbot/data/builds.py b/master/buildbot/data/builds.py index 2576563ab05..f0f48160704 100644 --- a/master/buildbot/data/builds.py +++ b/master/buildbot/data/builds.py @@ -139,7 +139,7 @@ def generateEvent(self, _id, event): @base.updateMethod @defer.inlineCallbacks - def newBuild(self, builderid, buildrequestid, buildslaveid): + def addBuild(self, builderid, buildrequestid, buildslaveid): res = yield self.master.db.builds.addBuild( builderid=builderid, buildrequestid=buildrequestid, diff --git a/master/buildbot/data/logs.py b/master/buildbot/data/logs.py index 3551562a48c..d65ac34d224 100644 --- a/master/buildbot/data/logs.py +++ b/master/buildbot/data/logs.py @@ -114,7 +114,7 @@ def generateEvent(self, _id, event): @base.updateMethod @defer.inlineCallbacks - def newLog(self, stepid, name, type): + def addLog(self, stepid, name, type): slug = identifiers.forceIdentifier(50, name) while True: try: diff --git a/master/buildbot/data/steps.py b/master/buildbot/data/steps.py index 7a3396d6d19..bce4c3398e2 100644 --- a/master/buildbot/data/steps.py +++ b/master/buildbot/data/steps.py @@ -134,7 +134,7 @@ def generateEvent(self, stepid, event): @base.updateMethod @defer.inlineCallbacks - def newStep(self, buildid, name): + def addStep(self, buildid, name): stepid, num, name = yield self.master.db.steps.addStep( buildid=buildid, name=name, state_string=u'pending') yield self.generateEvent(stepid, 'new') diff --git a/master/buildbot/process/build.py b/master/buildbot/process/build.py index 9bc3d46f43d..c6347e29722 100644 --- a/master/buildbot/process/build.py +++ b/master/buildbot/process/build.py @@ -240,7 +240,7 @@ def startBuild(self, build_status, expectations, slavebuilder): # then we just assign the bulid to the first buildrequest brid = self.requests[0].id self.buildid, self.number = \ - yield self.master.data.updates.newBuild( + yield self.master.data.updates.addBuild( builderid=(yield self.builder.getBuilderId()), buildrequestid=brid, buildslaveid=slave.buildslaveid) diff --git a/master/buildbot/process/buildstep.py b/master/buildbot/process/buildstep.py index 9ae789278bf..eccfbcdea5e 100644 --- a/master/buildbot/process/buildstep.py +++ b/master/buildbot/process/buildstep.py @@ -432,7 +432,7 @@ def startStep(self, remote): # create and start the step, noting that the name may be altered to # ensure uniqueness - self.stepid, self.number, self.name = yield self.master.data.updates.newStep( + self.stepid, self.number, self.name = yield self.master.data.updates.addStep( buildid=self.build.buildid, name=util.ascii2unicode(self.name)) yield self.master.data.updates.startStep(self.stepid) @@ -681,7 +681,7 @@ def getSlaveName(self): return self.build.getSlaveName() def addLog(self, name, type='s', logEncoding=None): - d = self.master.data.updates.newLog(self.stepid, + d = self.master.data.updates.addLog(self.stepid, util.ascii2unicode(name), unicode(type)) @@ -712,7 +712,7 @@ def getLog_oldStyle(self, name): @defer.inlineCallbacks def addCompleteLog(self, name, text): log.msg("addCompleteLog(%s)" % name) - logid = yield self.master.data.updates.newLog(self.stepid, + logid = yield self.master.data.updates.addLog(self.stepid, util.ascii2unicode(name), u't') l = self._newLog(name, u't', logid) yield l.addContent(text) @@ -722,7 +722,7 @@ def addCompleteLog(self, name, text): @defer.inlineCallbacks def addHTMLLog(self, name, html): log.msg("addHTMLLog(%s)" % name) - logid = yield self.master.data.updates.newLog(self.stepid, + logid = yield self.master.data.updates.addLog(self.stepid, util.ascii2unicode(name), u'h') l = self._newLog(name, u'h', logid) yield l.addContent(html) diff --git a/master/buildbot/test/fake/fakedata.py b/master/buildbot/test/fake/fakedata.py index 4a63677a3f0..c58a981042f 100644 --- a/master/buildbot/test/fake/fakedata.py +++ b/master/buildbot/test/fake/fakedata.py @@ -277,7 +277,7 @@ def trySetChangeSourceMaster(self, changesourceid, masterid): self.changesourceMasters[changesourceid] = masterid return defer.succeed(True) - def newBuild(self, builderid, buildrequestid, buildslaveid): + def addBuild(self, builderid, buildrequestid, buildslaveid): validation.verifyType(self.testcase, 'builderid', builderid, validation.IntValidator()) validation.verifyType(self.testcase, 'buildrequestid', buildrequestid, @@ -313,7 +313,7 @@ def setBuildProperty(self, buildid, name, value, source): validation.StringValidator()) return defer.succeed(None) - def newStep(self, buildid, name): + def addStep(self, buildid, name): validation.verifyType(self.testcase, 'buildid', buildid, validation.IntValidator()) validation.verifyType(self.testcase, 'name', name, @@ -352,7 +352,7 @@ def finishStep(self, stepid, results, hidden): validation.BooleanValidator()) return defer.succeed(None) - def newLog(self, stepid, name, type): + def addLog(self, stepid, name, type): validation.verifyType(self.testcase, 'stepid', stepid, validation.IntValidator()) validation.verifyType(self.testcase, 'name', name, diff --git a/master/buildbot/test/integration/test_custom_buildstep.py b/master/buildbot/test/integration/test_custom_buildstep.py index 6dca6d0d7f9..d6bd49e512d 100644 --- a/master/buildbot/test/integration/test_custom_buildstep.py +++ b/master/buildbot/test/integration/test_custom_buildstep.py @@ -228,9 +228,9 @@ def assertLogs(self, exp_logs): @defer.inlineCallbacks def doOldStyleCustomBuildStep(self, slowDB=False): - # patch out newLog to delay until we're ready + # patch out addLog to delay until we're ready newLogDeferreds = [] - oldNewLog = self.master.data.updates.newLog + oldNewLog = self.master.data.updates.addLog def finishNewLog(self): for d in newLogDeferreds: @@ -243,7 +243,7 @@ def delayedNewLog(*args, **kwargs): return d if slowDB: self.patch(self.master.data.updates, - "newLog", delayedNewLog) + "addLog", delayedNewLog) self.patch(OldStyleCustomBuildStep, "_run_finished_hook", finishNewLog) diff --git a/master/buildbot/test/integration/test_setproperyfromcommand.py b/master/buildbot/test/integration/test_setproperyfromcommand.py index 6395ce9fbbb..bbe20245857 100644 --- a/master/buildbot/test/integration/test_setproperyfromcommand.py +++ b/master/buildbot/test/integration/test_setproperyfromcommand.py @@ -26,7 +26,7 @@ class SetProperyFromCommand(RunMasterBase): @defer.inlineCallbacks def test_setProp(self): - oldNewLog = self.master.data.updates.newLog + oldNewLog = self.master.data.updates.addLog @defer.inlineCallbacks def newLog(*arg, **kw): @@ -35,7 +35,7 @@ def newLog(*arg, **kw): yield task.deferLater(reactor, .1, lambda: None) res = yield oldNewLog(*arg, **kw) defer.returnValue(res) - self.master.data.updates.newLog = newLog + self.master.data.updates.addLog = newLog build = yield self.doForceBuild(wantProperties=True) self.assertEqual(build['properties']['test'], (u'foo', u'SetPropertyFromCommand Step')) diff --git a/master/buildbot/test/unit/test_data_builds.py b/master/buildbot/test/unit/test_data_builds.py index 70a4a60c2cb..a83743e501e 100644 --- a/master/buildbot/test/unit/test_data_builds.py +++ b/master/buildbot/test/unit/test_data_builds.py @@ -176,20 +176,20 @@ def do_test_event(self, method, exp_events=[], def test_signature_newBuild(self): @self.assertArgSpecMatches( - self.master.data.updates.newBuild, # fake - self.rtype.newBuild) # real + self.master.data.updates.addBuild, # fake + self.rtype.addBuild) # real def newBuild(self, builderid, buildrequestid, buildslaveid): pass def test_newBuild(self): - return self.do_test_callthrough('addBuild', self.rtype.newBuild, + return self.do_test_callthrough('addBuild', self.rtype.addBuild, builderid=10, buildrequestid=13, buildslaveid=20, exp_kwargs=dict(builderid=10, buildrequestid=13, buildslaveid=20, masterid=self.master.masterid, state_string=u'created')) def test_newBuildEvent(self): - return self.do_test_event(self.rtype.newBuild, + return self.do_test_event(self.rtype.addBuild, builderid=10, buildrequestid=13, buildslaveid=20, exp_events=[(('builders', '10', 'builds', '1', 'new'), self.new_build_event), (('builds', '100', 'new'), self.new_build_event)]) diff --git a/master/buildbot/test/unit/test_data_logs.py b/master/buildbot/test/unit/test_data_logs.py index 88e66c753dd..b281a9afc2b 100644 --- a/master/buildbot/test/unit/test_data_logs.py +++ b/master/buildbot/test/unit/test_data_logs.py @@ -196,8 +196,8 @@ def do_test_callthrough(self, dbMethodName, method, exp_args=None, def test_signature_newLog(self): @self.assertArgSpecMatches( - self.master.data.updates.newLog, # fake - self.rtype.newLog) # real + self.master.data.updates.addLog, # fake + self.rtype.addLog) # real def newLog(self, stepid, name, type): pass @@ -212,7 +212,7 @@ def addLog(stepid, name, slug, type): return defer.fail(KeyError()) return defer.succeed(23) self.patch(self.master.db.logs, 'addLog', addLog) - logid = yield self.rtype.newLog( + logid = yield self.rtype.addLog( stepid=13, name=u'foo', type=u's') self.assertEqual(logid, 23) self.assertEqual(tries, [ diff --git a/master/buildbot/test/unit/test_data_steps.py b/master/buildbot/test/unit/test_data_steps.py index d1c102e522b..415281f09af 100644 --- a/master/buildbot/test/unit/test_data_steps.py +++ b/master/buildbot/test/unit/test_data_steps.py @@ -155,14 +155,14 @@ def setUp(self): def test_signature_newStep(self): @self.assertArgSpecMatches( - self.master.data.updates.newStep, # fake - self.rtype.newStep) # real + self.master.data.updates.addStep, # fake + self.rtype.addStep) # real def newStep(self, buildid, name): pass @defer.inlineCallbacks def test_newStep(self): - stepid, number, name = yield self.rtype.newStep(buildid=10, + stepid, number, name = yield self.rtype.addStep(buildid=10, name=u'name') msgBody = { 'buildid': 10, @@ -198,7 +198,7 @@ def test_newStep(self): @defer.inlineCallbacks def test_fake_newStep(self): self.assertEqual( - len((yield self.master.data.updates.newStep(buildid=10, + len((yield self.master.data.updates.addStep(buildid=10, name=u'ten'))), 3) diff --git a/master/buildbot/test/unit/test_process_log.py b/master/buildbot/test/unit/test_process_log.py index bb9c719c5bd..a2ea0dbe783 100644 --- a/master/buildbot/test/unit/test_process_log.py +++ b/master/buildbot/test/unit/test_process_log.py @@ -31,7 +31,7 @@ def setUp(self): @defer.inlineCallbacks def makeLog(self, type, logEncoding='utf-8'): - logid = yield self.master.data.updates.newLog( + logid = yield self.master.data.updates.addLog( stepid=27, name=u'testlog', type=unicode(type)) defer.returnValue(log.Log.new(self.master, u'testlog', type, logid, logEncoding)) diff --git a/master/buildbot/test/unit/test_process_logobserver.py b/master/buildbot/test/unit/test_process_logobserver.py index 065f1a56f08..a40dadecf43 100644 --- a/master/buildbot/test/unit/test_process_logobserver.py +++ b/master/buildbot/test/unit/test_process_logobserver.py @@ -47,7 +47,7 @@ def setUp(self): @defer.inlineCallbacks def test_sequence(self): - logid = yield self.master.data.updates.newLog(1, u'mine', u's') + logid = yield self.master.data.updates.addLog(1, u'mine', u's') l = log.Log.new(self.master, 'mine', 's', logid, 'utf-8') lo = MyLogObserver() lo.setLog(l) @@ -95,7 +95,7 @@ def setUp(self): @defer.inlineCallbacks def do_test_sequence(self, consumer): - logid = yield self.master.data.updates.newLog(1, u'mine', u's') + logid = yield self.master.data.updates.addLog(1, u'mine', u's') l = log.Log.new(self.master, 'mine', 's', logid, 'utf-8') lo = logobserver.LineConsumerLogObserver(consumer) lo.setLog(l) @@ -159,7 +159,7 @@ def setUp(self): @defer.inlineCallbacks def test_sequence(self): - logid = yield self.master.data.updates.newLog(1, u'mine', u's') + logid = yield self.master.data.updates.addLog(1, u'mine', u's') l = log.Log.new(self.master, 'mine', 's', logid, 'utf-8') lo = MyLogLineObserver() lo.setLog(l) @@ -195,7 +195,7 @@ def setUp(self): @defer.inlineCallbacks def test_sequence(self): - logid = yield self.master.data.updates.newLog(1, u'mine', u's') + logid = yield self.master.data.updates.addLog(1, u'mine', u's') l = log.Log.new(self.master, 'mine', 's', logid, 'utf-8') lo = logobserver.OutputProgressObserver('stdio') step = mock.Mock() @@ -214,7 +214,7 @@ def setUp(self): @defer.inlineCallbacks def do_test_sequence(self, lo): - logid = yield self.master.data.updates.newLog(1, u'mine', u's') + logid = yield self.master.data.updates.addLog(1, u'mine', u's') l = log.Log.new(self.master, 'mine', 's', logid, 'utf-8') lo.setLog(l)