zuul
/
zuul
Code Issues Proposed changes

Revert "Fix pep8 E127 violations" 

This reverts commit afd39bb3cd

This change should be rebased against the dev branch instead and
submitted there. Once the production CI freeze ends immediately
following the OpenStack Folsom release, dev changes will be merged back
into master.

Change-Id: Iabc1a0b287f0a433ca297a0d5cd1e21dd670e1d3
Reviewed-on: https://review.openstack.org/13638
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Jeremy Stanley 2012-09-25 16:10:02 +00:00 committed by Jenkins
parent afd39bb3cd
commit b8ff8a7fc7
6 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.mailmap
View File

@ -1,4 +0,0 @@
# 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>
Clark Boylan <clark.boylan@gmail.com>
Zhongyue Luo <zhongyue.nah@intel.com>
Zhongyue Luo <lzyeval@gmail.com>

40
tests/test_scheduler.py
View File

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

4
tox.ini
View File

@ -10,8 +10,8 @@ commands = nosetests {posargs}
downloadcache = ~/cache/pip
[testenv:pep8]
deps = pep8==1.3.3
commands = pep8 --ignore=E122,E125,E126,E128 --repeat --show-source --exclude=.venv,.tox,dist,doc,build .
deps = pep8==1.2
commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,build .
[testenv:cover]
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,
# then you get a 404.
request = urllib2.Request(self.server + CANCEL_QUEUE % locals(),
headers={'Referer': self.server})
headers={'Referer': self.server})
self.jenkins_open(request)
def get_build_info(self, name, number):

2
zuul/model.py
View File

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