This commit is contained in:
Andrew Morgan 2019-04-10 11:49:48 +01:00
parent 4501489e39
commit 0200c864d2

View file

@ -22,7 +22,7 @@ from twisted.test.proto_helpers import StringTransport
from twisted.web.client import ResponseNeverReceived from twisted.web.client import ResponseNeverReceived
from twisted.web.http import HTTPChannel from twisted.web.http import HTTPChannel
from synapse.api.errors import RequestSendFailed, SynapseError from synapse.api.errors import RequestSendFailed
from synapse.http.matrixfederationclient import ( from synapse.http.matrixfederationclient import (
MatrixFederationHttpClient, MatrixFederationHttpClient,
MatrixFederationRequest, MatrixFederationRequest,
@ -212,7 +212,6 @@ class FederationClientTests(HomeserverTestCase):
self.assertIsInstance(f.value, RequestSendFailed) self.assertIsInstance(f.value, RequestSendFailed)
self.assertIsInstance(f.value.inner_exception, ResponseNeverReceived) self.assertIsInstance(f.value.inner_exception, ResponseNeverReceived)
@unittest.DEBUG
def test_client_ip_range_blacklist(self): def test_client_ip_range_blacklist(self):
"""Ensure that Synapse does not try to connect to blacklisted IPs""" """Ensure that Synapse does not try to connect to blacklisted IPs"""
# Set up the ip_range blacklist # Set up the ip_range blacklist
@ -287,7 +286,6 @@ class FederationClientTests(HomeserverTestCase):
clients = self.reactor.tcpClients clients = self.reactor.tcpClients
self.assertEqual(len(clients), 0) self.assertEqual(len(clients), 0)
# Try making a GET request to a non-blacklisted IPv4 address # Try making a GET request to a non-blacklisted IPv4 address
# ---------------------------------------------------------- # ----------------------------------------------------------
@defer.inlineCallbacks @defer.inlineCallbacks