summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-10-04 12:07:02 +0100
committerNeil Johnson <neil@matrix.org>2019-10-04 12:07:02 +0100
commit0d146cb0ee161da3d3b89c7dc4f2580e7b334c60 (patch)
treeb09aa24ce9a856804063887750491cf8989b33c8
parentfix misshandling mau reaping where reserved users are present (diff)
downloadsynapse-0d146cb0ee161da3d3b89c7dc4f2580e7b334c60.tar.xz
fix logic and remove unused code
-rw-r--r--tests/storage/test_monthly_active_users.py11
1 files changed, 1 insertions, 10 deletions
diff --git a/tests/storage/test_monthly_active_users.py b/tests/storage/test_monthly_active_users.py
index 62aa2bfed7..f2cca0f5c2 100644
--- a/tests/storage/test_monthly_active_users.py
+++ b/tests/storage/test_monthly_active_users.py
@@ -148,7 +148,7 @@ class MonthlyActiveUsersTestCase(unittest.HomeserverTestCase):
         self.pump()
         count = self.store.get_monthly_active_count()
         self.assertEquals(
-            self.get_success(count), initial_users - self.hs.config.max_mau_value
+            self.get_success(count), self.hs.config.max_mau_value
         )
 
         self.reactor.advance(FORTY_DAYS)
@@ -197,15 +197,6 @@ class MonthlyActiveUsersTestCase(unittest.HomeserverTestCase):
             self.get_success(count), self.hs.config.max_mau_value
         )
 
-    def _populate_reserved_users(self, user, email):
-        """Helper function that registers userpopulates reserved users"""
-        # Test reserved registed users
-        self.store.register_user(user_id=user, password_hash=None)
-        self.pump()
-
-        now = int(self.hs.get_clock().time_msec())
-        self.store.user_add_threepid(user, "email", email, now, now)
-
     def test_populate_monthly_users_is_guest(self):
         # Test that guest users are not added to mau list
         user_id = "@user_id:host"