Update integration tests to use recent basket image

The big change since the last image was basket switched to using rq for a task queue.
mozilla-it · Oct 29, 2024 · a285e11 · a285e11
1 parent b36f7e7
commit a285e11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -45,7 +45,7 @@ services:
       - 8080:8080
   basket:
     profiles: [integration-test]
-    image: mozmeao/basket:2023-04-24
+    image: mozmeao/basket:2024-10-21
     env_file:
       - ./tests/integration/basket.env
     command:
@@ -66,7 +66,7 @@ services:
       retries: 10
   basket-worker:
     profiles: [integration-test]
-    image: mozmeao/basket:2023-04-24
+    image: mozmeao/basket:2024-10-21
     env_file:
       - ./tests/integration/basket.env
     command:
@@ -79,11 +79,10 @@ services:
       web:
         condition: service_healthy
     healthcheck:
-      test: celery -b redis://redis:6379 -A basket.news inspect ping
+      test: rq info -R default | grep -q "queues"
       interval: 3s
-      # This healthcheck takes forever to start/complete!?
-      timeout: 60s
-      retries: 10
+      timeout: 1s
+      retries: 5
   mysql:
     profiles: [integration-test]
     image: mariadb:11.2.3

diff --git a/tests/integration/basket.env b/tests/integration/basket.env
@@ -9,10 +9,7 @@ CTMS_CLIENT_SECRET=bogus_MzOWu8UMz5N6M4--2iX9jgJ05JX5MziH6KeH8dI6hrw  # pragma:
 DEBUG=True
 ALLOWED_HOSTS=*
 SECRET_KEY=sssssssshhhhhhhhhh  # pragma: allowlist secret
-CELERY_TASK_ALWAYS_EAGER=False
-CELERY_NUM_WORKERS=1
-# CELERY_POOL=prefork
-CELERY_LOG_LEVEL=debug
+RQ_IS_ASYNC=True
 DJANGO_LOG_LEVEL=DEBUG
 OAUTHLIB_INSECURE_TRANSPORT=1
 URLWAIT_TIMEOUT=30