diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000000..18221d4058 --- /dev/null +++ b/.mailmap @@ -0,0 +1,4 @@ +# Format is: +# +# +Zhongyue Luo diff --git a/AUTHORS b/AUTHORS index 61b563367e..09d24373a1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,3 @@ James E. Blair Clark Boylan -Zhongyue Luo +Zhongyue Luo diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py index 41848f6d34..3493c985fd 100644 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py @@ -362,14 +362,17 @@ 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) @@ -815,7 +818,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) @@ -1122,13 +1125,18 @@ 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() diff --git a/tox.ini b/tox.ini index d4a0074529..34075cb706 100644 --- a/tox.ini +++ b/tox.ini @@ -10,8 +10,8 @@ commands = nosetests {posargs} downloadcache = ~/cache/pip [testenv:pep8] -deps = pep8==1.2 -commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,build . +deps = pep8==1.3.3 +commands = pep8 --ignore=E122,E125,E126,E128 --repeat --show-source --exclude=.venv,.tox,dist,doc,build . [testenv:cover] setenv = NOSE_WITH_COVERAGE=1 diff --git a/zuul/launcher/jenkins.py b/zuul/launcher/jenkins.py index 6fd4ca4109..be659aed33 100644 --- a/zuul/launcher/jenkins.py +++ b/zuul/launcher/jenkins.py @@ -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): diff --git a/zuul/model.py b/zuul/model.py index 7deef068da..96859c48f2 100644 --- a/zuul/model.py +++ b/zuul/model.py @@ -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