diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-05-10 10:39:08 -0700 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-05-10 10:39:08 -0700 |
| commit | e0715d035bf9d99cf1d7cae8aa43b8411fcc8ea5 (patch) | |
| tree | d5c120d5ebcfd7d4b8a5f821b38f4b037b60e413 /tests/push/test_email.py | |
| parent | regen config (diff) | |
| parent | URL preview blacklisting fixes (#5155) (diff) | |
| download | synapse-anoa/blacklist_ip_ranges.tar.xz | |
Merge branch 'develop' into anoa/blacklist_ip_ranges github/anoa/blacklist_ip_ranges anoa/blacklist_ip_ranges
* develop: (45 commits) URL preview blacklisting fixes (#5155) Revert 085ae346ace418e0fc043ac5f568f85ebf80038e Add a DUMMY stage to captcha-only registration flow Make Prometheus snippet less confusing on the metrics collection doc (#4288) Set syslog identifiers in systemd units (#5023) Run Black on the tests again (#5170) Add AllowEncodedSlashes to apache (#5068) remove instructions for jessie installation (#5164) Run `black` on per_destination_queue Limit the number of EDUs in transactions to 100 as expected by receiver (#5138) Fix bogus imports in tests (#5154) add options to require an access_token to GET /profile and /publicRooms on CS API (#5083) Do checks on aliases for incoming m.room.aliases events (#5128) Remove the requirement to authenticate for /admin/server_version. (#5122) Fix spelling in server notices admin API docs (#5142) Fix sample config 0.99.3.2 include disco in deb build target list changelog Debian: we now need libpq-dev. ...
Diffstat (limited to 'tests/push/test_email.py')
| -rw-r--r-- | tests/push/test_email.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/push/test_email.py b/tests/push/test_email.py index be3fed8de3..325ea449ae 100644 --- a/tests/push/test_email.py +++ b/tests/push/test_email.py @@ -19,7 +19,8 @@ import pkg_resources from twisted.internet.defer import Deferred -from synapse.rest.client.v1 import admin, login, room +import synapse.rest.admin +from synapse.rest.client.v1 import login, room from tests.unittest import HomeserverTestCase @@ -33,7 +34,7 @@ class EmailPusherTests(HomeserverTestCase): skip = "No Jinja installed" if not load_jinja2_templates else None servlets = [ - admin.register_servlets, + synapse.rest.admin.register_servlets_for_client_rest_resource, room.register_servlets, login.register_servlets, ] |