Strengthen tests about deleted old push actions. (#13471)

matrix-org · Aug 9, 2022 · 5ce2887 · 5ce2887
1 parent 70d3e70
commit 5ce2887
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/changelog.d/13471.misc b/changelog.d/13471.misc
@@ -0,0 +1 @@
+Clean-up tests for notifications.
diff --git a/tests/storage/test_event_push_actions.py b/tests/storage/test_event_push_actions.py
@@ -135,7 +135,22 @@ def _mark_read(event_id: str) -> None:
         _assert_counts(1, 1, 0)
 
         # Delete old event push actions, this should not affect the (summarised) count.
+        #
+        # All event push actions are kept for 24 hours, so need to move forward
+        # in time.
+        self.pump(60 * 60 * 24)
         self.get_success(self.store._remove_old_push_actions_that_have_rotated())
+        # Double check that the event push actions have been cleared (i.e. that
+        # any results *must* come from the summary).
+        result = self.get_success(
+            self.store.db_pool.simple_select_list(
+                table="event_push_actions",
+                keyvalues={"1": 1},
+                retcols=("event_id",),
+                desc="",
+            )
+        )
+        self.assertEqual(result, [])
         _assert_counts(1, 1, 0)
 
         _mark_read(last_event_id)