diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-24 22:31:25 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-24 22:31:25 -0400 |
commit | c40d7244f8e07538a7ab25c255e803bc54fb7cb3 (patch) | |
tree | a502c6063ce25bb2ddaa479a7ce64d705e52b261 /tests/handlers | |
parent | don't error if federation query doesn't have cross-signing keys (diff) | |
parent | Merge pull request #6248 from matrix-org/erikj/move_schema_files (diff) | |
download | synapse-c40d7244f8e07538a7ab25c255e803bc54fb7cb3.tar.xz |
Merge branch 'develop' into cross-signing_federation
Diffstat (limited to 'tests/handlers')
-rw-r--r-- | tests/handlers/test_stats.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/handlers/test_stats.py b/tests/handlers/test_stats.py index 7569b6fab5..d5c8bd7612 100644 --- a/tests/handlers/test_stats.py +++ b/tests/handlers/test_stats.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse import storage from synapse.rest import admin from synapse.rest.client.v1 import login, room +from synapse.storage.data_stores.main import stats from tests import unittest @@ -87,10 +87,10 @@ class StatsRoomTests(unittest.HomeserverTestCase): ) def _get_current_stats(self, stats_type, stat_id): - table, id_col = storage.stats.TYPE_TO_TABLE[stats_type] + table, id_col = stats.TYPE_TO_TABLE[stats_type] - cols = list(storage.stats.ABSOLUTE_STATS_FIELDS[stats_type]) + list( - storage.stats.PER_SLICE_FIELDS[stats_type] + cols = list(stats.ABSOLUTE_STATS_FIELDS[stats_type]) + list( + stats.PER_SLICE_FIELDS[stats_type] ) end_ts = self.store.quantise_stats_time(self.reactor.seconds() * 1000) |