diff options
| author | Shay <hillerys@element.io> | 2022-08-24 14:18:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 14:18:31 -0700 |
| commit | 172b651832cea2d832beb5c4ff5bfae4581c8e63 (patch) | |
| tree | ebd49a80d21b84b51606da49d2a94241d4f1c13a /tests/api | |
| parent | fix test to align with new behaviour (diff) | |
| parent | Rename `event_map` to `unpersisted_events` (#13603) (diff) | |
| download | synapse-172b651832cea2d832beb5c4ff5bfae4581c8e63.tar.xz | |
Merge branch 'develop' into shay/batch_events
Diffstat (limited to 'tests/api')
| -rw-r--r-- | tests/api/test_auth.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/api/test_auth.py b/tests/api/test_auth.py index dfcfaf79b6..e0f363555b 100644 --- a/tests/api/test_auth.py +++ b/tests/api/test_auth.py @@ -284,10 +284,13 @@ class AuthTestCase(unittest.HomeserverTestCase): TokenLookupResult( user_id="@baldrick:matrix.org", device_id="device", + token_id=5, token_owner="@admin:matrix.org", + token_used=True, ) ) self.store.insert_client_ip = simple_async_mock(None) + self.store.mark_access_token_as_used = simple_async_mock(None) request = Mock(args={}) request.getClientAddress.return_value.host = "127.0.0.1" request.args[b"access_token"] = [self.test_token] @@ -301,10 +304,13 @@ class AuthTestCase(unittest.HomeserverTestCase): TokenLookupResult( user_id="@baldrick:matrix.org", device_id="device", + token_id=5, token_owner="@admin:matrix.org", + token_used=True, ) ) self.store.insert_client_ip = simple_async_mock(None) + self.store.mark_access_token_as_used = simple_async_mock(None) request = Mock(args={}) request.getClientAddress.return_value.host = "127.0.0.1" request.args[b"access_token"] = [self.test_token] @@ -347,7 +353,7 @@ class AuthTestCase(unittest.HomeserverTestCase): serialized = macaroon.serialize() user_info = self.get_success(self.auth.get_user_by_access_token(serialized)) - self.assertEqual(user_id, user_info.user_id) + self.assertEqual(user_id, user_info.user.to_string()) self.assertTrue(user_info.is_guest) self.store.get_user_by_id.assert_called_with(user_id) |