Fixed unit test error caused by extra definition of ActivityStream model. Rearranged imports of signal handlers.

This commit is contained in:
Chris Church
2013-11-18 22:54:39 -05:00
parent 3377927c00
commit b8edfab481
6 changed files with 11 additions and 29 deletions

View File

@@ -7,7 +7,6 @@ from awx.main.models.projects import *
from awx.main.models.inventory import *
from awx.main.models.jobs import *
from awx.main.models.activity_stream import *
from awx.main.registrar import activity_stream_registrar
# Monkeypatch Django serializer to ignore django-taggit fields (which break
# the dumpdata command; see https://github.com/alex/django-taggit/issues/155).
@@ -30,6 +29,7 @@ User.add_to_class('can_access', check_user_access)
# Import signal handlers only after models have been defined.
import awx.main.signals
from awx.main.registrar import activity_stream_registrar
activity_stream_registrar.connect(Organization)
activity_stream_registrar.connect(Inventory)
activity_stream_registrar.connect(Host)