vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add missing bitbucket test

Browse source
This commit is contained in:
Joseph Schorr 2017-02-13 16:17:52 -05:00
parent 497c90e7ea
commit 84b298f36b
2 changed files with 82 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
buildtrigger/bitbuckethandler.py
View file

@ -35,7 +35,7 @@ BITBUCKET_WEBHOOK_PAYLOAD_SCHEMA = {
},
},
'required': ['full_name'],
},
}, # /Repository
'push': {
'type': 'object',
'properties': {
@ -91,10 +91,10 @@ BITBUCKET_WEBHOOK_PAYLOAD_SCHEMA = {
},
},
'required': ['html', 'avatar'],
},
}, # /User
},
'required': ['username'],
},
}, # /Author
},
},
'links': {
@ -111,19 +111,19 @@ BITBUCKET_WEBHOOK_PAYLOAD_SCHEMA = {
},
},
'required': ['html'],
},
}, # /Links
},
'required': ['hash', 'message', 'date'],
},
}, # /Target
},
'required': ['target'],
},
'required': ['name', 'target'],
}, # /New
},
},
},
}, # /Changes item
}, # /Changes
},
'required': ['changes'],
},
}, # / Push
},
'actor': {
'type': 'object',
@ -157,9 +157,9 @@ BITBUCKET_WEBHOOK_PAYLOAD_SCHEMA = {
},
},
'required': ['username'],
},
}, # /Actor
'required': ['push', 'repository'],
}
} # /Root
BITBUCKET_COMMIT_INFO_SCHEMA = {
'type': 'object',
@ -242,7 +242,7 @@ def get_transformed_webhook_payload(bb_payload, default_branch=None):
config['default_branch'] = default_branch
config['git_url'] = 'git@bitbucket.org:%s.git' % repository_name
config['commit_info.url'] = target['links.html.href']
config['commit_info.url'] = target['links.html.href'] or ''
config['commit_info.message'] = target['message']
config['commit_info.date'] = target['date']

69
buildtrigger/test/test_bitbuckethandler.py
View file

@ -1,6 +1,11 @@
import json
import pytest
from buildtrigger.test.bitbucketmock import get_bitbucket_trigger
from buildtrigger.triggerutil import (SkipRequestException, ValidationRequestException,
InvalidPayloadException)
from endpoints.building import PreparedBuild
from util.morecollections import AttrDict
@pytest.fixture
def bitbucket_trigger():
@ -20,3 +25,67 @@ def test_load_dockerfile_contents(subdir, contents):
trigger = get_bitbucket_trigger(subdir)
assert trigger.load_dockerfile_contents() == contents
@pytest.mark.parametrize('payload, expected_error, expected_message', [
('{}', InvalidPayloadException, "'push' is a required property"),
# Valid payload:
('''{
"push": {
"changes": [{
"new": {
"name": "somechange",
"target": {
"hash": "aaaaaaa",
"message": "foo",
"date": "now",
"links": {
"html": {
"href": "somelink"
}
}
}
}
}]
},
"repository": {
"full_name": "foo/bar"
}
}''', None, None),
# Skip message:
('''{
"push": {
"changes": [{
"new": {
"name": "somechange",
"target": {
"hash": "aaaaaaa",
"message": "[skip build] foo",
"date": "now",
"links": {
"html": {
"href": "somelink"
}
}
}
}
}]
},
"repository": {
"full_name": "foo/bar"
}
}''', SkipRequestException, ''),
])
def test_handle_trigger_request(bitbucket_trigger, payload, expected_error, expected_message):
def get_payload():
return json.loads(payload)
request = AttrDict(dict(get_json=get_payload))
if expected_error is not None:
with pytest.raises(expected_error) as ipe:
bitbucket_trigger.handle_trigger_request(request)
assert ipe.value.message == expected_message
else:
assert isinstance(bitbucket_trigger.handle_trigger_request(request), PreparedBuild)