valkey tests

Author: cunla

.github/workflows/test.yml

@@ -30,29 +30,39 @@ jobs:
   test:
     needs: [ 'flake8' ]
     runs-on: ubuntu-latest
-    name: "Run tests ${{ matrix.python-version }}/${{ matrix.django-version }}/${{ matrix.fake-redis }}"
+    name: "Run tests ${{ matrix.python-version }}/${{ matrix.django-version }}/${{ matrix.broker }}"
     strategy:
       max-parallel: 6
       matrix:
         python-version: [ '3.10', '3.11', '3.12' ]
         django-version: [ '5.0.7', '5.1.1' ]
-        fake-redis: ['True', 'False']
+        broker: [ 'redis', 'fakeredis' ]
         include:
           - python-version: '3.12'
             django-version: '5.1.1'
-            fake-redis: 'False'
+            broker: 'redis'
             coverage: yes
 
     services:
       redis:
         image: redis:7.2.2
         ports:
           - 6379:6379
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+        healthcheck:
+          test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
+          interval: 1s
+          timeout: 3s
+          retries: 5
+
+      valkey:
+        image: valkey/valkey:8.0
+        ports:
+          - 6380:6379
+        healthcheck:
+          test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
+          interval: 1s
+          timeout: 3s
+          retries: 5
 
     outputs:
       version: ${{ steps.getVersion.outputs.VERSION }}
@@ -91,7 +101,12 @@ jobs:
         if: ${{ matrix.coverage != 'yes' }}
         run: |
           cd testproject
-          export FAKEREDIS=${{ matrix.fake-redis }}
+          export FAKEREDIS=${{ matrix.broker == 'fakeredis' }}
+          if [ ${{ matrix.broker == 'valkey' }} == true ]; then
+            export BROKER_PORT=6380
+          else
+            export BROKER_PORT=6379
+          fi
           poetry run python manage.py test scheduler
 
       # Steps for coverage check
@@ -102,6 +117,7 @@ jobs:
           pythonVer: ${{ matrix.python-version }}
           djangoVer: ${{ matrix.django-version }}
           repoToken: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Create coverage badge
         if: ${{ matrix.coverage == 'yes' && github.event_name == 'push' }}
         uses: schneegans/[email protected]

scheduler/management/commands/rqworker.py

@@ -5,7 +5,6 @@
 import click
 from django.core.management.base import BaseCommand
 from django.db import connections
-from django.template.defaultfilters import default
 from redis.exceptions import ConnectionError
 from rq.logutils import setup_loghandlers
 

testproject/testproject/settings.py

@@ -111,22 +111,23 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
 
+BROKER_PORT = os.getenv("BROKER_PORT", "6379")
 STATIC_URL = "/static/"
 SCHEDULER_QUEUES = {
     "default": {
-        "URL": "redis://localhost:6379/0",
+        "URL": f"redis://localhost:${BROKER_PORT}/0",
     },
     "low": {
-        "URL": "redis://localhost:6379/0",
+        "URL": f"redis://localhost:${BROKER_PORT}/0",
     },
     "high": {
-        "URL": "redis://localhost:6379/1",
+        "URL": f"redis://localhost:${BROKER_PORT}/1",
     },
     "medium": {
-        "URL": "redis://localhost:6379/1",
+        "URL": f"redis://localhost:${BROKER_PORT}/1",
     },
     "another": {
-        "URL": "redis://localhost:6379/1",
+        "URL": f"redis://localhost:${BROKER_PORT}/1",
     },
 }
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"