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

Update for merge and make additional interface improvements

Browse source
This commit is contained in:
Joseph Schorr 2017-07-19 11:05:50 -04:00
parent 543cba352b
commit e7d6e60d97
10 changed files with 85 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

3
notifications/test/test_notificationevent.py
View file

@ -1,6 +1,5 @@
import pytest
from notifications.models_interface import Repository
from notifications.notificationevent import (BuildSuccessEvent, NotificationEvent,
VulnerabilityFoundEvent)
from util.morecollections import AttrDict
@ -17,7 +16,7 @@ def test_create_notifications(event_kind):
def test_build_notification(event_name, initialized_db):
# Create the notification event.
found = NotificationEvent.get_event(event_name)
sample_data = found.get_sample_data(Repository('foo', 'bar'), {'level': 'low'})
sample_data = found.get_sample_data('foo', 'bar', {'level': 'low'})
# Make sure all calls succeed.
notification_data = {

12
notifications/test/test_notificationmethod.py
View file

@ -14,10 +14,10 @@ from test.fixtures import *
def assert_validated(method, method_config, error_message, namespace_name, repo_name):
if error_message is None:
method.validate(Repository(namespace_name, repo_name), method_config)
method.validate(namespace_name, repo_name, method_config)
else:
with pytest.raises(CannotValidateNotificationMethodException) as ipe:
method.validate(Repository(namespace_name, repo_name), method_config)
method.validate(namespace_name, repo_name, method_config)
assert ipe.value.message == error_message
@ -98,7 +98,7 @@ def test_perform_quay_notification(target, expected_users, initialized_db):
event_handler = NotificationEvent.get_event('repo_push')
sample_data = event_handler.get_sample_data(repository, {})
sample_data = event_handler.get_sample_data(repository.namespace_name, repository.name, {})
method = QuayNotificationMethod()
method.perform(notification, event_handler, {'event_data': sample_data})
@ -116,8 +116,7 @@ def test_perform_email(initialized_db):
repository=repository)
event_handler = NotificationEvent.get_event('repo_push')
sample_data = event_handler.get_sample_data(repository, {})
sample_data = event_handler.get_sample_data(repository.namespace_name, repository.name, {})
mock = Mock()
def get_mock(*args, **kwargs):
@ -143,8 +142,7 @@ def test_perform_http_call(method, method_config, netloc, initialized_db):
repository=repository)
event_handler = NotificationEvent.get_event('repo_push')
sample_data = event_handler.get_sample_data(repository, {})
sample_data = event_handler.get_sample_data(repository.namespace_name, repository.name, {})
url_hit = [False]
@urlmatch(netloc=netloc)