test: Add rq 1.5 to test matrix (getsentry#768)

untitaker · web-flow · commit 62a6d3260c31 · 2020-07-27T20:28:34.000+02:00
diff --git a/tests/integrations/rq/test_rq.py b/tests/integrations/rq/test_rq.py
@@ -1,9 +1,29 @@
 from sentry_sdk.integrations.rq import RqIntegration
 
+import pytest
+
 from fakeredis import FakeStrictRedis
 import rq
 
 
+@pytest.fixture(autouse=True)
+def _patch_rq_get_server_version(monkeypatch):
+    """
+    Patch up RQ 1.5 to work with fakeredis.
+
+    https://github.com/jamesls/fakeredis/issues/273
+    """
+
+    from distutils.version import StrictVersion
+
+    if tuple(map(int, rq.VERSION.split("."))) >= (1, 5):
+        for k in (
+            "rq.job.Job.get_redis_server_version",
+            "rq.worker.Worker.get_redis_server_version",
+        ):
+            monkeypatch.setattr(k, lambda _: StrictVersion("4.0.0"))
+
+
 def crashing_job(foo):
     1 / 0
 
diff --git a/tox.ini b/tox.ini
@@ -48,7 +48,7 @@ envlist =
 
     {pypy,py2.7,py3.5,py3.6}-rq-{0.6,0.7,0.8,0.9,0.10,0.11}
     {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-rq-{0.12,0.13,1.0,1.1,1.2,1.3}
-    {py3.5,py3.6,py3.7,py3.8}-rq-1.4
+    {py3.5,py3.6,py3.7,py3.8}-rq-{1.4,1.5}
 
     py3.7-aiohttp-3.5
     {py3.7,py3.8}-aiohttp-3.6
@@ -139,7 +139,7 @@ deps =
     # https://github.com/jamesls/fakeredis/issues/245
     rq-{0.6,0.7,0.8,0.9,0.10,0.11,0.12}: fakeredis<1.0
     rq-{0.6,0.7,0.8,0.9,0.10,0.11,0.12}: redis<3.2.2
-    rq-{0.13,1.0,1.1,1.2,1.3,1.4}: fakeredis>=1.0
+    rq-{0.13,1.0,1.1,1.2,1.3,1.4,1.5}: fakeredis>=1.0
 
     rq-0.6: rq>=0.6,<0.7
     rq-0.7: rq>=0.7,<0.8
@@ -154,6 +154,7 @@ deps =
     rq-1.2: rq>=1.2,<1.3
     rq-1.3: rq>=1.3,<1.4
     rq-1.4: rq>=1.4,<1.5
+    rq-1.5: rq>=1.5,<1.6
 
     aiohttp-3.4: aiohttp>=3.4.0,<3.5.0
     aiohttp-3.5: aiohttp>=3.5.0,<3.6.0
