diff options
| author | David Robertson <davidr@element.io> | 2023-11-23 12:35:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-23 12:35:37 +0000 |
| commit | 32a59a6495f8d463f82ae52283159359a9961c25 (patch) | |
| tree | 44824e6214f748c4ed576af7a4d3986e398a6983 /tests/rest | |
| parent | Enable refreshable tokens on the admin registration endpoint (#16642) (diff) | |
| download | synapse-32a59a6495f8d463f82ae52283159359a9961c25.tar.xz | |
Keep track of `user_ips` and `monthly_active_users` when delegating auth (#16672)
* Describe `insert_client_ip` * Pull out client_ips and MAU tracking to BaseAuth * Define HAS_AUTHLIB once in tests sick of copypasting * Track ips and token usage when delegating auth * Test that we track MAU and user_ips * Don't track `__oidc_admin`
Diffstat (limited to 'tests/rest')
| -rw-r--r-- | tests/rest/admin/test_jwks.py | 8 | ||||
| -rw-r--r-- | tests/rest/client/test_keys.py | 8 | ||||
| -rw-r--r-- | tests/rest/test_well_known.py | 8 |
3 files changed, 3 insertions, 21 deletions
diff --git a/tests/rest/admin/test_jwks.py b/tests/rest/admin/test_jwks.py index a9a6191c73..842e92c3d0 100644 --- a/tests/rest/admin/test_jwks.py +++ b/tests/rest/admin/test_jwks.py @@ -19,13 +19,7 @@ from twisted.web.resource import Resource from synapse.rest.synapse.client import build_synapse_client_resource_tree from tests.unittest import HomeserverTestCase, override_config, skip_unless - -try: - import authlib # noqa: F401 - - HAS_AUTHLIB = True -except ImportError: - HAS_AUTHLIB = False +from tests.utils import HAS_AUTHLIB @skip_unless(HAS_AUTHLIB, "requires authlib") diff --git a/tests/rest/client/test_keys.py b/tests/rest/client/test_keys.py index 9f81a695fa..a6023dff7a 100644 --- a/tests/rest/client/test_keys.py +++ b/tests/rest/client/test_keys.py @@ -30,13 +30,7 @@ from synapse.types import JsonDict, Requester, create_requester from tests import unittest from tests.http.server._base import make_request_with_cancellation_test from tests.unittest import override_config - -try: - import authlib # noqa: F401 - - HAS_AUTHLIB = True -except ImportError: - HAS_AUTHLIB = False +from tests.utils import HAS_AUTHLIB class KeyQueryTestCase(unittest.HomeserverTestCase): diff --git a/tests/rest/test_well_known.py b/tests/rest/test_well_known.py index 377243a170..7931a70abb 100644 --- a/tests/rest/test_well_known.py +++ b/tests/rest/test_well_known.py @@ -16,13 +16,7 @@ from twisted.web.resource import Resource from synapse.rest.well_known import well_known_resource from tests import unittest - -try: - import authlib # noqa: F401 - - HAS_AUTHLIB = True -except ImportError: - HAS_AUTHLIB = False +from tests.utils import HAS_AUTHLIB class WellKnownTests(unittest.HomeserverTestCase): |