Merge pull request #5396 from AlanCoding/signal_intelligence

Avoid a particular kind of nonsense activity stream entry

awx/main/signals.py

@@ -180,8 +180,16 @@ def rbac_activity_stream(instance, sender, **kwargs):
             elif sender.__name__ == 'Role_parents':
                 role = kwargs['model'].objects.filter(pk__in=kwargs['pk_set']).first()
                 # don't record implicit creation / parents
-                if role is not None and role.content_type is not None:
-                    parent = role.content_type.name + "." + role.role_field
+                if role is not None:
+                    if role.content_type is None:
+                        if role.is_singleton():
+                            parent = 'singleton:' + role.singleton_name
+                        else:
+                            # Ill-defined role, may need additional logic in the
+                            # case of future expansions of the RBAC system
+                            parent = str(role.role_field)
+                    else:
+                        parent = role.content_type.name + "." + role.role_field
                     # Get the list of implicit parents that were defined at the class level.
                     # We have to take this list from the class property to avoid including parents
                     # that may have been added since the creation of the ImplicitRoleField

awx/main/tests/functional/conftest.py

@@ -56,15 +56,6 @@ def clear_cache():
     cache.clear()
 
 
-@pytest.fixture(scope="session", autouse=False)
-def disable_signals():
-    '''
-    Disable all django model signals.
-    '''
-    mocked = mock.patch('django.dispatch.Signal.send', autospec=True)
-    mocked.start()
-
-
 @pytest.fixture(scope="session", autouse=True)
 def celery_memory_broker():
     '''

awx/main/tests/functional/models/test_activity_stream.py

@@ -0,0 +1,13 @@
+import pytest
+
+# AWX models
+from awx.main.models.organization import Organization
+from awx.main.models import ActivityStream
+
+
+
+@pytest.mark.django_db
+def test_activity_stream_create_entries():
+    Organization.objects.create(name='test-organization2')
+    assert ActivityStream.objects.filter(organization__isnull=False).count() == 1
+