Don't require hiredis to run unit tests (#8680)

matrix-org · Oct 29, 2020 · 9a7e0d2 · 9a7e0d2
1 parent c97da1e
commit 9a7e0d2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/changelog.d/8680.misc b/changelog.d/8680.misc
@@ -0,0 +1 @@
+Don't require `hiredis` package to be installed to run unit tests.
diff --git a/tests/replication/_base.py b/tests/replication/_base.py
@@ -16,7 +16,6 @@
 from typing import Any, Callable, List, Optional, Tuple
 
 import attr
-import hiredis
 
 from twisted.internet.interfaces import IConsumer, IPullProducer, IReactorTime
 from twisted.internet.protocol import Protocol
@@ -39,12 +38,22 @@
 from tests import unittest
 from tests.server import FakeTransport, render
 
+try:
+ import hiredis
+except ImportError:
+ hiredis = None
+
 logger = logging.getLogger(__name__)
 
 
 class BaseStreamTestCase(unittest.HomeserverTestCase):
  """Base class for tests of the replication streams"""
 
+ # hiredis is an optional dependency so we don't want to require it for running
+ # the tests.
+ if not hiredis:
+ skip = "Requires hiredis"
+
  servlets = [
  streams.register_servlets,
  ]