tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

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

Browse source
This commit is contained in:
Erik Johnston 2020-10-29 11:17:35 +00:00 committed by GitHub
parent c97da1e45d
commit 9a7e0d2ea6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/8680.misc Normal file
View file

@ -0,0 +1 @@
Don't require `hiredis` package to be installed to run unit tests.

11
tests/replication/_base.py
View file

@ -16,7 +16,6 @@ import logging
from typing import Any, Callable, List, Optional, Tuple from typing import Any, Callable, List, Optional, Tuple
import attr import attr
import hiredis
from twisted.internet.interfaces import IConsumer, IPullProducer, IReactorTime from twisted.internet.interfaces import IConsumer, IPullProducer, IReactorTime
from twisted.internet.protocol import Protocol from twisted.internet.protocol import Protocol
@ -39,12 +38,22 @@ from synapse.util import Clock
from tests import unittest from tests import unittest
from tests.server import FakeTransport, render from tests.server import FakeTransport, render
try:
import hiredis
except ImportError:
hiredis = None
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class BaseStreamTestCase(unittest.HomeserverTestCase): class BaseStreamTestCase(unittest.HomeserverTestCase):
"""Base class for tests of the replication streams""" """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 = [ servlets = [
streams.register_servlets, streams.register_servlets,
] ]