paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

analytics: Add subgroup argument to assertCountEquals.

Browse Source
This commit is contained in:
Rishi Gupta
2016-12-16 17:26:46 -08:00
committed by Tim Abbott
parent 31cf8db28c
commit f34af0896d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
analytics/tests/test_counts.py
View File

@@ -67,15 +67,17 @@ class AnalyticsTestCase(TestCase):
return Message.objects.create(**kwargs) return Message.objects.create(**kwargs)
# kwargs should only ever be a UserProfile or Stream. # kwargs should only ever be a UserProfile or Stream.
def assertCountEquals(self, table, property, value, end_time = TIME_ZERO, interval = CountStat.HOUR, def assertCountEquals(self, table, property, value, subgroup=None, end_time=TIME_ZERO,
realm = None, **kwargs): interval=CountStat.HOUR, realm=None, **kwargs):
# type: (Type[BaseCount], Text, int, datetime, str, Optional[Realm], **models.Model) -> None # type: (Type[BaseCount], Text, int, Optional[Text], datetime, str, Optional[Realm], **models.Model) -> None
queryset = table.objects.filter(property=property, interval=interval, end_time=end_time) \ queryset = table.objects.filter(property=property, interval=interval, end_time=end_time) \
.filter(**kwargs) .filter(**kwargs)
if table is not InstallationCount: if table is not InstallationCount:
if realm is None: if realm is None:
realm = self.default_realm realm = self.default_realm
queryset = queryset.filter(realm=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) self.assertEqual(queryset.values_list('value', flat=True)[0], value)
# Tests manangement commands, backfilling, adding new stats, etc # Tests manangement commands, backfilling, adding new stats, etc