diff options
| author | James E. Blair <jeblair@openstack.org> | 2013-07-09 09:11:34 -0700 |
|---|---|---|
| committer | Jenkins <jenkins@review.openstack.org> | 2013-07-11 21:51:13 +0000 |
| commit | 78e31b30ba411a3cfd5cd02864f483a555a25fd2 (patch) | |
| tree | 0ebe4f24875194b50f0517d9c4daa65ef0099cf3 | |
| parent | 98f0f3ed638828d209e3bb15279ef0c9957d56f8 (diff) | |
| download | zuul-78e31b30ba411a3cfd5cd02864f483a555a25fd2.tar.gz | |
Make E128 pep8 clean
Change-Id: I9ac6e301d361b7bac8561a1f468c40be23e1ddcc
Reviewed-on: https://review.openstack.org/36281
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
| -rw-r--r-- | tests/test_scheduler.py | 4 | ||||
| -rw-r--r-- | tox.ini | 2 | ||||
| -rw-r--r-- | zuul/merger.py | 4 | ||||
| -rw-r--r-- | zuul/scheduler.py | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py index 595451a88..023ed356a 100644 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py @@ -601,7 +601,7 @@ class FakeWorker(gear.Worker): def release(self, regex=None): builds = self.running_builds[:] self.log.debug("releasing build %s (%s)" % (regex, - len(self.running_builds))) + len(self.running_builds))) for build in builds: if not regex or re.match(regex, build.name): self.log.debug("releasing build %s" % @@ -1775,7 +1775,7 @@ class TestScheduler(testtools.TestCase): self.assertEqual(A.data['status'], 'NEW') self.assertEqual(A.reported, 1) self.assertEqual(self.getJobFromHistory('project-merge').result, - 'SUCCESS') + 'SUCCESS') self.assertEqual(self.getJobFromHistory('project-test1').result, 'SUCCESS') self.assertEqual(self.getJobFromHistory('project-test2').result, @@ -33,6 +33,6 @@ commands = {posargs} commands = zuul-server -c etc/zuul.conf-sample -t -l {posargs} [flake8] -ignore = E123,E125,E128,H +ignore = E123,E125,H show-source = True exclude = .venv,.tox,dist,doc,build,*.egg diff --git a/zuul/merger.py b/zuul/merger.py index d9199c884..8ab3ee869 100644 --- a/zuul/merger.py +++ b/zuul/merger.py @@ -123,7 +123,7 @@ class Merger(object): log = logging.getLogger("zuul.Merger") def __init__(self, trigger, working_root, push_refs, sshkey, email, - username): + username): self.trigger = trigger self.repos = {} self.working_root = working_root @@ -227,7 +227,7 @@ class Merger(object): target_ref=target_ref, mode=mode) # Sibling changes exist. Merge current change against newest sibling. elif (len(sibling_items) >= 2 and - sibling_items[-2].current_build_set.commit): + sibling_items[-2].current_build_set.commit): last_commit = sibling_items[-2].current_build_set.commit commit = self._mergeChange(item.change, last_commit, target_ref=target_ref, mode=mode) diff --git a/zuul/scheduler.py b/zuul/scheduler.py index b92f18745..52df7db73 100644 --- a/zuul/scheduler.py +++ b/zuul/scheduler.py @@ -428,8 +428,8 @@ class Scheduler(threading.Thread): continue item.change.project = project severed = item in shared_queue.severed_heads - if not new_pipeline.manager.reEnqueueItem(item, - severed=severed): + if not new_pipeline.manager.reEnqueueItem( + item, severed=severed): items_to_remove.append(item) builds_to_remove = [] for build, item in old_pipeline.manager.building_jobs.items(): |