Merge pull request #1085 from alphagov/celery4

Celery 4 (attempt 2)

tests/app/celery/test_statistics_tasks.py

@@ -1,14 +1,21 @@
 import pytest
+from sqlalchemy.exc import SQLAlchemyError
+
+from app import create_uuid
 from app.celery.statistics_tasks import (
     record_initial_job_statistics,
     record_outcome_job_statistics,
     create_initial_notification_statistic_tasks,
     create_outcome_notification_statistic_tasks)
-from sqlalchemy.exc import SQLAlchemyError
-from app import create_uuid
+from app.models import (
+    NOTIFICATION_STATUS_TYPES_COMPLETED,
+    NOTIFICATION_SENDING,
+    NOTIFICATION_PENDING,
+    NOTIFICATION_CREATED,
+    NOTIFICATION_DELIVERED
+)
+
 from tests.app.conftest import sample_notification
-from app.models import NOTIFICATION_STATUS_TYPES_COMPLETED, NOTIFICATION_SENT, NOTIFICATION_SENDING, \
-    NOTIFICATION_PENDING, NOTIFICATION_CREATED, NOTIFICATION_DELIVERED
 
 
 def test_should_create_initial_job_task_if_notification_is_related_to_a_job(

tests/app/service/test_send_one_off_notification.py

@@ -5,7 +5,7 @@ import pytest
 from notifications_utils.recipients import InvalidPhoneError
 
 from app.v2.errors import BadRequestError, TooManyRequestsError
-from app.config import QueueNames
+from app.celery import QueueNames
 from app.service.send_notification import send_one_off_notification
 from app.models import KEY_TYPE_NORMAL, PRIORITY, SMS_TYPE