From 16e89ed08173c5b0f0e153bed7bee3e0c8429705 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 28 Sep 2018 09:43:10 -0400 Subject: [PATCH] send test notifications after the transaction closes to avoid a race --- awx/api/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index ac5e693527..b49cdf6f00 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -19,7 +19,7 @@ import six from django.conf import settings from django.core.exceptions import FieldError, ObjectDoesNotExist from django.db.models import Q, Count, F -from django.db import IntegrityError, transaction +from django.db import IntegrityError, transaction, connection from django.shortcuts import get_object_or_404 from django.utils.encoding import smart_text from django.utils.safestring import mark_safe @@ -4960,7 +4960,7 @@ class NotificationTemplateTest(GenericAPIView): if not notification: return Response({}, status=status.HTTP_400_BAD_REQUEST) else: - send_notifications.delay([notification.id]) + connection.on_commit(lambda: send_notifications.delay([notification.id])) data = OrderedDict() data['notification'] = notification.id data.update(NotificationSerializer(notification, context=self.get_serializer_context()).to_representation(notification))