Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix E741 on test_process_build #3107

Merged
merged 1 commit into from
Apr 12, 2017
Merged

fix E741 on test_process_build #3107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
65 changes: 32 additions & 33 deletions master/buildbot/test/unit/test_process_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,9 @@ def testBuildcanStartWithWorkerForBuilder(self):
workerforbuilder1 = Mock()
workerforbuilder2 = Mock()

l = WorkerLock('lock')
counting_access = l.access('counting')
real_lock = b.builder.botmaster.getLockByID(l)
lock = WorkerLock('lock')
counting_access = lock.access('counting')
real_lock = b.builder.botmaster.getLockByID(lock)

# no locks, so both these pass (call twice to verify there's no
# state/memory)
Expand Down Expand Up @@ -344,11 +344,11 @@ def testBuilddirPropType(self):
def testBuildLocksAcquired(self):
b = self.build

l = WorkerLock('lock')
lock = WorkerLock('lock')
claimCount = [0]
lock_access = l.access('counting')
l.access = lambda mode: lock_access
real_lock = b.builder.botmaster.getLockByID(l) \
lock_access = lock.access('counting')
lock.access = lambda mode: lock_access
real_lock = b.builder.botmaster.getLockByID(lock) \
.getLock(self.workerforbuilder.worker)

def claim(owner, access):
Expand Down Expand Up @@ -387,21 +387,21 @@ def testBuildLocksOrder(self):
eWorker.prepare = cWorker.prepare = lambda _: True
eWorker.ping = cWorker.ping = lambda: True

l = WorkerLock('lock', 2)
lock = WorkerLock('lock', 2)
claimLog = []
realLock = self.master.botmaster.getLockByID(l).getLock(self.worker)
realLock = self.master.botmaster.getLockByID(lock).getLock(self.worker)

def claim(owner, access):
claimLog.append(owner)
return realLock.oldClaim(owner, access)
realLock.oldClaim = realLock.claim
realLock.claim = claim

eBuild.setLocks([l.access('exclusive')])
cBuild.setLocks([l.access('counting')])
eBuild.setLocks([lock.access('exclusive')])
cBuild.setLocks([lock.access('counting')])

fakeBuild = Mock()
fakeBuildAccess = l.access('counting')
fakeBuildAccess = lock.access('counting')
realLock.claim(fakeBuild, fakeBuildAccess)

step = Mock()
Expand All @@ -427,11 +427,11 @@ def check(ign):
def testBuildWaitingForLocks(self):
b = self.build

l = WorkerLock('lock')
lock = WorkerLock('lock')
claimCount = [0]
lock_access = l.access('counting')
l.access = lambda mode: lock_access
real_lock = b.builder.botmaster.getLockByID(l) \
lock_access = lock.access('counting')
lock.access = lambda mode: lock_access
real_lock = b.builder.botmaster.getLockByID(lock) \
.getLock(self.workerforbuilder.worker)

def claim(owner, access):
Expand All @@ -446,7 +446,7 @@ def claim(owner, access):
step.startStep.return_value = SUCCESS
b.setStepFactories([FakeStepFactory(step)])

real_lock.claim(Mock(), l.access('counting'))
real_lock.claim(Mock(), lock.access('counting'))

b.startBuild(FakeBuildStatus(), self.workerforbuilder)

Expand All @@ -459,10 +459,10 @@ def claim(owner, access):
def testStopBuildWaitingForLocks(self):
b = self.build

l = WorkerLock('lock')
lock_access = l.access('counting')
l.access = lambda mode: lock_access
real_lock = b.builder.botmaster.getLockByID(l) \
lock = WorkerLock('lock')
lock_access = lock.access('counting')
lock.access = lambda mode: lock_access
real_lock = b.builder.botmaster.getLockByID(lock) \
.getLock(self.workerforbuilder.worker)
b.setLocks([lock_access])

Expand All @@ -472,7 +472,7 @@ def testStopBuildWaitingForLocks(self):
step.alwaysRun = False
b.setStepFactories([FakeStepFactory(step)])

real_lock.claim(Mock(), l.access('counting'))
real_lock.claim(Mock(), lock.access('counting'))

def acquireLocks(res=None):
retval = Build.acquireLocks(b, res)
Expand All @@ -491,10 +491,10 @@ def acquireLocks(res=None):
def testStopBuildWaitingForLocks_lostRemote(self):
b = self.build

l = WorkerLock('lock')
lock_access = l.access('counting')
l.access = lambda mode: lock_access
real_lock = b.builder.botmaster.getLockByID(l) \
lock = WorkerLock('lock')
lock_access = lock.access('counting')
lock.access = lambda mode: lock_access
real_lock = b.builder.botmaster.getLockByID(lock) \
.getLock(self.workerforbuilder.worker)
b.setLocks([lock_access])

Expand All @@ -504,7 +504,7 @@ def testStopBuildWaitingForLocks_lostRemote(self):
step.alwaysRun = False
b.setStepFactories([FakeStepFactory(step)])

real_lock.claim(Mock(), l.access('counting'))
real_lock.claim(Mock(), lock.access('counting'))

def acquireLocks(res=None):
retval = Build.acquireLocks(b, res)
Expand All @@ -526,16 +526,16 @@ def acquireLocks(res=None):
def testStopBuildWaitingForStepLocks(self):
b = self.build

l = WorkerLock('lock')
lock_access = l.access('counting')
l.access = lambda mode: lock_access
real_lock = b.builder.botmaster.getLockByID(l) \
lock = WorkerLock('lock')
lock_access = lock.access('counting')
lock.access = lambda mode: lock_access
real_lock = b.builder.botmaster.getLockByID(lock) \
.getLock(self.workerforbuilder.worker)

step = LoggingBuildStep(locks=[lock_access])
b.setStepFactories([FakeStepFactory(step)])

real_lock.claim(Mock(), l.access('counting'))
real_lock.claim(Mock(), lock.access('counting'))

gotLocks = [False]

Expand Down Expand Up @@ -1125,7 +1125,6 @@ def test_getWorkerName_old_api(self):
@implementer(interfaces.IProperties)
class FakeProperties(Mock):
pass

import posixpath

r = FakeRequest()
Expand Down