diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2021-06-23 15:57:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 15:57:41 +0100 |
| commit | 394673055db4df49bfd58c2f6118834a6d928563 (patch) | |
| tree | 2269ef20c8974b3e156abf4a276536b8346f3fc5 /tests/rest/client | |
| parent | Improve the reliability of auto-joining remote rooms (#10237) (diff) | |
| download | synapse-394673055db4df49bfd58c2f6118834a6d928563.tar.xz | |
Re-introduce "Leave out optional keys from /sync" change (#10214)
Required some fixes due to merge conflicts with #6739, but nothing too hairy. The first commit is the same as the original (after merge conflict resolution) then two more for compatibility with the latest sync code.
Diffstat (limited to 'tests/rest/client')
| -rw-r--r-- | tests/rest/client/v2_alpha/test_sync.py | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/tests/rest/client/v2_alpha/test_sync.py b/tests/rest/client/v2_alpha/test_sync.py index 012910f136..cdca3a3e23 100644 --- a/tests/rest/client/v2_alpha/test_sync.py +++ b/tests/rest/client/v2_alpha/test_sync.py @@ -41,35 +41,7 @@ class FilterTestCase(unittest.HomeserverTestCase): channel = self.make_request("GET", "/sync") self.assertEqual(channel.code, 200) - self.assertTrue( - { - "next_batch", - "rooms", - "presence", - "account_data", - "to_device", - "device_lists", - }.issubset(set(channel.json_body.keys())) - ) - - def test_sync_presence_disabled(self): - """ - When presence is disabled, the key does not appear in /sync. - """ - self.hs.config.use_presence = False - - channel = self.make_request("GET", "/sync") - - self.assertEqual(channel.code, 200) - self.assertTrue( - { - "next_batch", - "rooms", - "account_data", - "to_device", - "device_lists", - }.issubset(set(channel.json_body.keys())) - ) + self.assertIn("next_batch", channel.json_body) class SyncFilterTestCase(unittest.HomeserverTestCase): |