Merge pull request #3107 from tardyp/flake8_l

fix E741 on test_process_build

master/buildbot/test/unit/test_process_build.py

@@ -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)
@@ -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):
@@ -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()
@@ -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):
@@ -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)
 
@@ -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])
 
@@ -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)
@@ -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])
 
@@ -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)
@@ -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]
 
@@ -1125,7 +1125,6 @@ def test_getWorkerName_old_api(self):
         @implementer(interfaces.IProperties)
         class FakeProperties(Mock):
             pass
-
         import posixpath
 
         r = FakeRequest()