summary refs log tree commit diff
path: root/tests/storage/test_redaction.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-12-03 10:02:47 +0000
committerGitHub <noreply@github.com>2020-12-03 10:02:47 +0000
commit66f75c5b74196c624af6a39d824c93b4a37d63c2 (patch)
tree6a57f03750897cf5b97d8188e497f54ce104581c /tests/storage/test_redaction.py
parentMerge pull request #8858 from matrix-org/rav/sso_uia (diff)
parentMerge remote-tracking branch 'origin/develop' into rav/remove_unused_mocks (diff)
downloadsynapse-66f75c5b74196c624af6a39d824c93b4a37d63c2.tar.xz
Merge pull request #8861 from matrix-org/rav/remove_unused_mocks
Remove some unnecessary mocking from the unit tests
Diffstat (limited to 'tests/storage/test_redaction.py')
-rw-r--r--tests/storage/test_redaction.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/storage/test_redaction.py b/tests/storage/test_redaction.py

index fd0add5db3..a6303bf0ee 100644 --- a/tests/storage/test_redaction.py +++ b/tests/storage/test_redaction.py
@@ -14,9 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - -from mock import Mock - from canonicaljson import json from twisted.internet import defer @@ -30,12 +27,10 @@ from tests.utils import create_room class RedactionTestCase(unittest.HomeserverTestCase): - def make_homeserver(self, reactor, clock): - config = self.default_config() + def default_config(self): + config = super().default_config() config["redaction_retention_period"] = "30d" - return self.setup_test_homeserver( - resource_for_federation=Mock(), federation_http_client=None, config=config - ) + return config def prepare(self, reactor, clock, hs): self.store = hs.get_datastore()