diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-11-16 18:22:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 18:22:24 +0000 |
| commit | 3dc1871219f845954a4b7d31fc06739831d67d2e (patch) | |
| tree | a54654d07bc289d36fea381102c26e6c63d3e0b5 /tests/unittest.py | |
| parent | Move `wait_until_result` into `FakeChannel` (#8758) (diff) | |
| parent | fixup test (diff) | |
| download | synapse-3dc1871219f845954a4b7d31fc06739831d67d2e.tar.xz | |
Merge pull request #8757 from matrix-org/rav/pass_site_to_make_request
Pass a Site into `make_request`
Diffstat (limited to 'tests/unittest.py')
| -rw-r--r-- | tests/unittest.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/unittest.py b/tests/unittest.py index c630760e51..e39cb8dec9 100644 --- a/tests/unittest.py +++ b/tests/unittest.py @@ -252,7 +252,7 @@ class HomeserverTestCase(TestCase): from tests.rest.client.v1.utils import RestHelper - self.helper = RestHelper(self.hs, self.resource, getattr(self, "user_id", None)) + self.helper = RestHelper(self.hs, self.site, getattr(self, "user_id", None)) if hasattr(self, "user_id"): if self.hijack_auth: @@ -425,11 +425,9 @@ class HomeserverTestCase(TestCase): Returns: Tuple[synapse.http.site.SynapseRequest, channel] """ - if isinstance(content, dict): - content = json.dumps(content).encode("utf8") - return make_request( self.reactor, + self.site, method, path, content, |