Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test_counts: Remove mostly unused assert_table_count helper. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2024-10-20 12:39:06 -07:00 committed by Tim Abbott
parent 71ca928ec9
commit 5b486a74f5
1 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
analytics/tests/test_counts.py
View File

@ -6,7 +6,6 @@ from unittest import mock
import time_machine import time_machine
from django.apps import apps from django.apps import apps
from django.db import models
from django.db.models import Sum from django.db.models import Sum
from django.utils.timezone import now as timezone_now from django.utils.timezone import now as timezone_now
from psycopg2.sql import SQL, Literal from psycopg2.sql import SQL, Literal
@ -68,7 +67,6 @@ from zerver.models import (
Message, Message,
NamedUserGroup, NamedUserGroup,
PreregistrationUser, PreregistrationUser,
Realm,
RealmAuditLog, RealmAuditLog,
Recipient, Recipient,
Stream, Stream,
@ -112,7 +110,7 @@ class AnalyticsTestCase(ZulipTestCase):
# used to generate unique names in self.create_* # used to generate unique names in self.create_*
self.name_counter = 100 self.name_counter = 100
# used as defaults in self.assert_table_count # used as defaults in self.assertTableState
self.current_property: str | None = None self.current_property: str | None = None
# Delete RemoteRealm registrations to have a clean slate - the relevant # Delete RemoteRealm registrations to have a clean slate - the relevant
@ -227,30 +225,6 @@ class AnalyticsTestCase(ZulipTestCase):
content_type=content_type, content_type=content_type,
) )
# kwargs should only ever be a UserProfile or Stream.
def assert_table_count(
self,
table: type[BaseCount],
value: int,
property: str | None = None,
subgroup: str | None = None,
end_time: datetime = TIME_ZERO,
realm: Realm | None = None,
**kwargs: models.Model,
) -> None:
if property is None:
property = self.current_property
queryset = table._default_manager.filter(property=property, end_time=end_time).filter(
**kwargs
)
if table is not InstallationCount:
if realm is None:
realm = self.default_realm
queryset = queryset.filter(realm=realm)
if subgroup is not None:
queryset = queryset.filter(subgroup=subgroup)
self.assertEqual(queryset.values_list("value", flat=True)[0], value)
def assertTableState( def assertTableState(
self, table: type[BaseCount], arg_keys: list[str], arg_values: list[list[object]] self, table: type[BaseCount], arg_keys: list[str], arg_values: list[list[object]]
) -> None: ) -> None:
@ -819,9 +793,17 @@ class TestCountStats(AnalyticsTestCase):
do_fill_count_stat_at_hour(stat, self.TIME_ZERO) do_fill_count_stat_at_hour(stat, self.TIME_ZERO)
self.assert_table_count(UserCount, 1, subgroup="private_message") self.assertTableState(
self.assert_table_count(UserCount, 1, subgroup="huddle_message") UserCount,
self.assert_table_count(UserCount, 1, subgroup="public_stream") ["value", "subgroup", "user"],
[
[1, "private_message", user],
[1, "huddle_message", user],
[1, "public_stream", user],
[1, "public_stream", self.hourly_user],
[1, "public_stream", self.daily_user],
],
)
def test_messages_sent_by_client(self) -> None: def test_messages_sent_by_client(self) -> None:
stat = COUNT_STATS["messages_sent:client:day"] stat = COUNT_STATS["messages_sent:client:day"]