From 0177544af5e298e771f0dc53ec46bc7e36d3bc1a Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 1 Dec 2020 00:29:56 +0000 Subject: [PATCH] Fix broken testcase This test was broken by #8565. It doesn't need to set set `self.clock` here anyway - that is done by `setUp`. --- changelog.d/8851.misc | 1 + tests/rest/admin/test_media.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 changelog.d/8851.misc diff --git a/changelog.d/8851.misc b/changelog.d/8851.misc new file mode 100644 index 000000000000..7bef4226186c --- /dev/null +++ b/changelog.d/8851.misc @@ -0,0 +1 @@ +Simplify the way the `HomeServer` object caches its internal attributes. diff --git a/tests/rest/admin/test_media.py b/tests/rest/admin/test_media.py index 2a65ab33bd44..dadf9db6605f 100644 --- a/tests/rest/admin/test_media.py +++ b/tests/rest/admin/test_media.py @@ -192,7 +192,6 @@ def prepare(self, reactor, clock, hs): self.handler = hs.get_device_handler() self.media_repo = hs.get_media_repository_resource() self.server_name = hs.hostname - self.clock = hs.clock self.admin_user = self.register_user("admin", "pass", admin=True) self.admin_user_tok = self.login("admin", "pass")