zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-13 05:18:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mongoectomy_implementation' into devel

Browse Source
This commit is contained in:
Chris Meyers
2016-03-01 08:22:40 -05:00
parent 533c629040 7ffe46fc74
commit 356b9c99b3
31 changed files with 5095 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/tests/functional/test_notifications.py
+2 -5
View File
@@ -1,14 +1,11 @@
import mock
import pytest
from awx.main.models.notifications import Notification, Notifier
from awx.main.models.notifications import Notifier
from awx.main.models.inventory import Inventory, Group
from awx.main.models.organization import Organization
from awx.main.models.projects import Project
from awx.main.models.jobs import JobTemplate
from django.core.urlresolvers import reverse
from django.core.mail.message import EmailMessage
@pytest.fixture
def notifier():
@@ -111,7 +108,7 @@ def test_inherited_notifiers(get, post, user, organization, project):
@pytest.mark.django_db
def test_notifier_merging(get, post, user, organization, project, notifier):
u = user('admin-poster', True)
user('admin-poster', True)
organization.projects.add(project)
organization.notifiers_any.add(notifier)
project.notifiers_any.add(notifier)