diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-21 14:14:36 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-21 14:14:36 +0100 |
| commit | e529fa7574e68ef97a1cd0bae493782fac2bf838 (patch) | |
| tree | f094655476a9b2d89fb1316b40690c363208778f /tests/storage | |
| parent | Merge commit '55bb5fda3' into anoa/dinsic_release_1_21_x (diff) | |
| parent | Fix missing null character check on guest_access room state (diff) | |
| download | synapse-e529fa7574e68ef97a1cd0bae493782fac2bf838.tar.xz | |
Merge commit '4325be1a5' into anoa/dinsic_release_1_21_x
* commit '4325be1a5': Fix missing null character check on guest_access room state Fixed a bug with reactivating users with the admin API (#8362) Admin API for reported events (#8217) Fix wording of deprecation notice in changelog Deprecation warning for synapse admin api being accessible under /_matrix Create function to check for long names in devices (#8364) Add a comment re #1691 Fix a bad merge from release-v1.20.0. (#8354) Admin API for querying rooms where a user is a member (#8306) Catch-up after Federation Outage (bonus): Catch-up on Synapse Startup (#8322) Simplify super() calls to Python 3 syntax. (#8344) Allow appservice users to /login (#8320) Update test logging to be able to accept braces (#8335) Move lint dependencies to extras_require (#8330)
Diffstat (limited to 'tests/storage')
| -rw-r--r-- | tests/storage/test_appservice.py | 2 | ||||
| -rw-r--r-- | tests/storage/test_devices.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/storage/test_appservice.py b/tests/storage/test_appservice.py index cb808d4de4..46f94914ff 100644 --- a/tests/storage/test_appservice.py +++ b/tests/storage/test_appservice.py @@ -413,7 +413,7 @@ class ApplicationServiceTransactionStoreTestCase(unittest.TestCase): # required for ApplicationServiceTransactionStoreTestCase tests class TestTransactionStore(ApplicationServiceTransactionStore, ApplicationServiceStore): def __init__(self, database: DatabasePool, db_conn, hs): - super(TestTransactionStore, self).__init__(database, db_conn, hs) + super().__init__(database, db_conn, hs) class ApplicationServiceStoreConfigTestCase(unittest.TestCase): diff --git a/tests/storage/test_devices.py b/tests/storage/test_devices.py index 34ae8c9da7..ecb00f4e02 100644 --- a/tests/storage/test_devices.py +++ b/tests/storage/test_devices.py @@ -23,7 +23,7 @@ import tests.utils class DeviceStoreTestCase(tests.unittest.TestCase): def __init__(self, *args, **kwargs): - super(DeviceStoreTestCase, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.store = None # type: synapse.storage.DataStore @defer.inlineCallbacks |