diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-12-12 12:03:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-12 12:03:28 -0500 |
| commit | cb2db179945f567410b565f29725dff28449f013 (patch) | |
| tree | 133ad654bb437dc812e2f60ab65a7e747872ff33 /tests/handlers/test_e2e_keys.py | |
| parent | Fix redacted events being returned in search results ordered by "recent" (#6522) (diff) | |
| download | synapse-cb2db179945f567410b565f29725dff28449f013.tar.xz | |
look up cross-signing keys from the DB in bulk (#6486)
Diffstat (limited to 'tests/handlers/test_e2e_keys.py')
| -rw-r--r-- | tests/handlers/test_e2e_keys.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/handlers/test_e2e_keys.py b/tests/handlers/test_e2e_keys.py index fdfa2cbbc4..854eb6c024 100644 --- a/tests/handlers/test_e2e_keys.py +++ b/tests/handlers/test_e2e_keys.py @@ -183,10 +183,6 @@ class E2eKeysHandlerTestCase(unittest.TestCase): ) self.assertDictEqual(devices["master_keys"], {local_user: keys2["master_key"]}) - test_replace_master_key.skip = ( - "Disabled waiting on #https://github.com/matrix-org/synapse/pull/6486" - ) - @defer.inlineCallbacks def test_reupload_signatures(self): """re-uploading a signature should not fail""" @@ -507,7 +503,3 @@ class E2eKeysHandlerTestCase(unittest.TestCase): ], other_master_key["signatures"][local_user]["ed25519:" + usersigning_pubkey], ) - - test_upload_signatures.skip = ( - "Disabled waiting on #https://github.com/matrix-org/synapse/pull/6486" - ) |