zuul
/
zuul
Code Issues Proposed changes

Fix pep8 E127 violations 

Updated pep8 version requirement to 1.3.3
Fixed E127 errors
All ignores are to be removed in the next sequence of patches

Change-Id: Ia9e922b8873686a0f905f2548cc43d534ee1c912
Reviewed-on: https://review.openstack.org/13642
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Zhongyue Luo <zhongyue.nah@intel.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Zhongyue Luo 2012-09-21 02:00:47 +09:00 committed by Jenkins
parent 6ad5d5b1af
commit 5d55607e5b
6 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.mailmap Normal file
View File

@ -0,0 +1,4 @@
# Format is:
# <preferred e-mail> <other e-mail 1>
# <preferred e-mail> <other e-mail 2>
Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>

2
AUTHORS
View File

@ -1,3 +1,3 @@
James E. Blair <jeblair@hp.com> James E. Blair <jeblair@hp.com>
Clark Boylan <clark.boylan@gmail.com> Clark Boylan <clark.boylan@gmail.com>
Zhongyue Luo <lzyeval@gmail.com> Zhongyue Luo <zhongyue.nah@intel.com>

40
tests/test_scheduler.py
View File

@ -362,14 +362,17 @@ class FakeGerrit(object):
class FakeJenkinsEvent(object): class FakeJenkinsEvent(object):
def __init__(self, name, number, parameters, phase, status=None): def __init__(self, name, number, parameters, phase, status=None):
data = {'build': data = {
{'full_url': 'https://server/job/%s/%s/' % (name, number), 'build': {
'number': number, 'full_url': 'https://server/job/%s/%s/' % (name, number),
'parameters': parameters, 'number': number,
'phase': phase, 'parameters': parameters,
'url': 'job/%s/%s/' % (name, number)}, 'phase': phase,
'name': name, 'url': 'job/%s/%s/' % (name, number),
'url': 'job/%s/' % name} },
'name': name,
'url': 'job/%s/' % name,
}
if status: if status:
data['build']['status'] = status data['build']['status'] = status
self.body = json.dumps(data) self.body = json.dumps(data)
@ -815,7 +818,7 @@ class testScheduler(unittest.TestCase):
def test_independent_queues(self): def test_independent_queues(self):
"Test that changes end up in the right queues" "Test that changes end up in the right queues"
self.fake_jenkins.hold_jobs_in_build = True self.fake_jenkins.hold_jobs_in_build = True
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
A.addApproval('CRVW', 2) A.addApproval('CRVW', 2)
@ -1122,13 +1125,18 @@ class testScheduler(unittest.TestCase):
def test_post(self): def test_post(self):
"Test that post jobs run" "Test that post jobs run"
e = {"type": "ref-updated", e = {
"submitter": {"name": "User Name"}, "type": "ref-updated",
"refUpdate": {"oldRev": "submitter": {
"90f173846e3af9154517b88543ffbd1691f31366", "name": "User Name",
"newRev": },
"d479a0bfcb34da57a31adb2a595c0cf687812543", "refUpdate": {
"refName": "master", "project": "org/project"}} "oldRev": "90f173846e3af9154517b88543ffbd1691f31366",
"newRev": "d479a0bfcb34da57a31adb2a595c0cf687812543",
"refName": "master",
"project": "org/project",
}
}
self.fake_gerrit.addEvent(e) self.fake_gerrit.addEvent(e)
self.waitUntilSettled() self.waitUntilSettled()

4
tox.ini
View File

@ -10,8 +10,8 @@ commands = nosetests {posargs}
downloadcache = ~/cache/pip downloadcache = ~/cache/pip
[testenv:pep8] [testenv:pep8]
deps = pep8==1.2 deps = pep8==1.3.3
commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,build . commands = pep8 --ignore=E122,E125,E126,E128 --repeat --show-source --exclude=.venv,.tox,dist,doc,build .
[testenv:cover] [testenv:cover]
setenv = NOSE_WITH_COVERAGE=1 setenv = NOSE_WITH_COVERAGE=1

2
zuul/launcher/jenkins.py
View File

@ -155,7 +155,7 @@ class ExtendedJenkins(jenkins.Jenkins):
# Jenkins returns a 302 from this URL, unless Referer is not set, # Jenkins returns a 302 from this URL, unless Referer is not set,
# then you get a 404. # then you get a 404.
request = urllib2.Request(self.server + CANCEL_QUEUE % locals(), request = urllib2.Request(self.server + CANCEL_QUEUE % locals(),
headers={'Referer': self.server}) headers={'Referer': self.server})
self.jenkins_open(request) self.jenkins_open(request)
def get_build_info(self, name, number): def get_build_info(self, name, number):

2
zuul/model.py
View File

@ -565,7 +565,7 @@ class TriggerEvent(object):
class EventFilter(object): class EventFilter(object):
def __init__(self, types=[], branches=[], refs=[], approvals={}, def __init__(self, types=[], branches=[], refs=[], approvals={},
comment_filters=[]): comment_filters=[]):
self._types = types self._types = types
self._branches = branches self._branches = branches
self._refs = refs self._refs = refs