paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 09:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

analytics: Remove unneeded references to interval from test_counts.py.

Browse Source
This commit is contained in:
Rishi Gupta
2017-01-16 12:32:34 -08:00
committed by Tim Abbott
parent 12d277d4f4
commit c466036c80
1 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
analytics/tests/test_counts.py
View File

@@ -34,7 +34,6 @@ class AnalyticsTestCase(TestCase):
self.name_counter = 100 self.name_counter = 100
# used as defaults in self.assertCountEquals # used as defaults in self.assertCountEquals
self.current_property = None # type: Optional[str] self.current_property = None # type: Optional[str]
self.current_interval = None # type: Optional[str]
# Lightweight creation of users, streams, and messages # Lightweight creation of users, streams, and messages
def create_user(self, **kwargs): def create_user(self, **kwargs):
@@ -90,14 +89,11 @@ class AnalyticsTestCase(TestCase):
# kwargs should only ever be a UserProfile or Stream. # kwargs should only ever be a UserProfile or Stream.
def assertCountEquals(self, table, value, property=None, subgroup=None, def assertCountEquals(self, table, value, property=None, subgroup=None,
end_time=TIME_ZERO, interval=None, realm=None, **kwargs): end_time=TIME_ZERO, realm=None, **kwargs):
# type: (Type[BaseCount], int, Optional[Text], Optional[Text], datetime, Optional[str], Optional[Realm], **models.Model) -> None # type: (Type[BaseCount], int, Optional[Text], Optional[Text], datetime, Optional[Realm], **models.Model) -> None
if property is None: if property is None:
property = self.current_property property = self.current_property
if interval is None: queryset = table.objects.filter(property=property, end_time=end_time).filter(**kwargs)
interval = self.current_interval
queryset = table.objects.filter(property=property, interval=interval, end_time=end_time) \
.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
@@ -132,8 +128,7 @@ class AnalyticsTestCase(TestCase):
defaults = { defaults = {
'property': self.current_property, 'property': self.current_property,
'subgroup': None, 'subgroup': None,
'end_time': self.TIME_ZERO, 'end_time': self.TIME_ZERO}
'interval': self.current_interval}
for values in arg_values: for values in arg_values:
kwargs = {} # type: Dict[str, Any] kwargs = {} # type: Dict[str, Any]
for i in range(len(values)): for i in range(len(values)):
@@ -174,31 +169,28 @@ class TestProcessCountStat(AnalyticsTestCase):
# process new stat # process new stat
current_time = installation_epoch() + self.HOUR current_time = installation_epoch() + self.HOUR
count_stat = self.make_dummy_count_stat(current_time) count_stat = self.make_dummy_count_stat(current_time)
property = count_stat.property
process_count_stat(count_stat, current_time) process_count_stat(count_stat, current_time)
self.assertFillStateEquals(current_time) self.assertFillStateEquals(current_time)
self.assertEqual(InstallationCount.objects.filter(property = count_stat.property, self.assertEqual(InstallationCount.objects.filter(property=property).count(), 1)
interval = CountStat.HOUR).count(), 1)
# dirty stat # dirty stat
FillState.objects.filter(property=count_stat.property).update(state=FillState.STARTED) FillState.objects.filter(property=property).update(state=FillState.STARTED)
process_count_stat(count_stat, current_time) process_count_stat(count_stat, current_time)
self.assertFillStateEquals(current_time) self.assertFillStateEquals(current_time)
self.assertEqual(InstallationCount.objects.filter(property = count_stat.property, self.assertEqual(InstallationCount.objects.filter(property=property).count(), 1)
interval = CountStat.HOUR).count(), 1)
# clean stat, no update # clean stat, no update
process_count_stat(count_stat, current_time) process_count_stat(count_stat, current_time)
self.assertFillStateEquals(current_time) self.assertFillStateEquals(current_time)
self.assertEqual(InstallationCount.objects.filter(property = count_stat.property, self.assertEqual(InstallationCount.objects.filter(property=property).count(), 1)
interval = CountStat.HOUR).count(), 1)
# clean stat, with update # clean stat, with update
current_time = current_time + self.HOUR current_time = current_time + self.HOUR
count_stat = self.make_dummy_count_stat(current_time) count_stat = self.make_dummy_count_stat(current_time)
process_count_stat(count_stat, current_time) process_count_stat(count_stat, current_time)
self.assertFillStateEquals(current_time) self.assertFillStateEquals(current_time)
self.assertEqual(InstallationCount.objects.filter(property = count_stat.property, self.assertEqual(InstallationCount.objects.filter(property=property).count(), 2)
interval = CountStat.HOUR).count(), 2)
class TestCountStats(AnalyticsTestCase): class TestCountStats(AnalyticsTestCase):
def setUp(self): def setUp(self):
@@ -235,7 +227,6 @@ class TestCountStats(AnalyticsTestCase):
# type: () -> None # type: () -> None
stat = COUNT_STATS['active_users:is_bot'] stat = COUNT_STATS['active_users:is_bot']
self.current_property = stat.property self.current_property = stat.property
self.current_interval = stat.interval
# To be included # To be included
self.create_user(is_bot=True) self.create_user(is_bot=True)
@@ -259,7 +250,6 @@ class TestCountStats(AnalyticsTestCase):
# type: () -> None # type: () -> None
stat = COUNT_STATS['messages_sent'] stat = COUNT_STATS['messages_sent']
self.current_property = stat.property self.current_property = stat.property
self.current_interval = stat.interval
# Nothing in this query should be bot-related # Nothing in this query should be bot-related
user1 = self.create_user(is_bot=True) user1 = self.create_user(is_bot=True)
@@ -286,7 +276,6 @@ class TestCountStats(AnalyticsTestCase):
# type: () -> None # type: () -> None
stat = COUNT_STATS['messages_sent:is_bot'] stat = COUNT_STATS['messages_sent:is_bot']
self.current_property = stat.property self.current_property = stat.property
self.current_interval = stat.interval
bot = self.create_user(is_bot=True) bot = self.create_user(is_bot=True)
human1 = self.create_user() human1 = self.create_user()
@@ -316,7 +305,6 @@ class TestCountStats(AnalyticsTestCase):
# type: () -> None # type: () -> None
stat = COUNT_STATS['messages_sent:message_type'] stat = COUNT_STATS['messages_sent:message_type']
self.current_property = stat.property self.current_property = stat.property
self.current_interval = stat.interval
# Nothing currently in this stat that is bot related, but so many of # Nothing currently in this stat that is bot related, but so many of
# the rest of our stats make the human/bot distinction that one can # the rest of our stats make the human/bot distinction that one can
@@ -377,7 +365,6 @@ class TestCountStats(AnalyticsTestCase):
# type: () -> None # type: () -> None
stat = COUNT_STATS['messages_sent:message_type'] stat = COUNT_STATS['messages_sent:message_type']
self.current_property = stat.property self.current_property = stat.property
self.current_interval = stat.interval
user = self.create_user(id=1000) user = self.create_user(id=1000)
user_recipient = Recipient.objects.create(type_id=user.id, type=Recipient.PERSONAL) user_recipient = Recipient.objects.create(type_id=user.id, type=Recipient.PERSONAL)
@@ -397,7 +384,6 @@ class TestCountStats(AnalyticsTestCase):
# type: () -> None # type: () -> None
stat = COUNT_STATS['messages_sent:client'] stat = COUNT_STATS['messages_sent:client']
self.current_property = stat.property self.current_property = stat.property
self.current_interval = stat.interval
user1 = self.create_user(is_bot=True) user1 = self.create_user(is_bot=True)
user2 = self.create_user() user2 = self.create_user()
@@ -434,7 +420,6 @@ class TestCountStats(AnalyticsTestCase):
# type: () -> None # type: () -> None
stat = COUNT_STATS['messages_sent_to_stream:is_bot'] stat = COUNT_STATS['messages_sent_to_stream:is_bot']
self.current_property = stat.property self.current_property = stat.property
self.current_interval = stat.interval
bot = self.create_user(is_bot=True) bot = self.create_user(is_bot=True)
human1 = self.create_user() human1 = self.create_user()