Merge branch 'develop' of github.com:matrix-org/synapse into HEAD

* 'develop' of github.com:matrix-org/synapse: Fix unit tests (#8689)
matrix-org · Oct 29, 2020 · 82f4e84 · 82f4e84
2 parents cfbebc3 + ef2d627
commit 82f4e84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/8689.feature b/changelog.d/8689.feature
@@ -0,0 +1 @@
+Add an admin APIs to allow server admins to list users' pushers. Contributed by @dklimpel.
diff --git a/tests/rest/admin/test_user.py b/tests/rest/admin/test_user.py
@@ -1206,7 +1206,7 @@ def test_get_pushers(self):
         user_tuple = self.get_success(
             self.store.get_user_by_access_token(other_user_token)
         )
-        token_id = user_tuple["token_id"]
+        token_id = user_tuple.token_id
 
         self.get_success(
             self.hs.get_pusherpool().add_pusher(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add an admin APIs to allow server admins to list users' pushers. Contributed by @dklimpel.