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

analytics: Fix ValueErrors affecting test coverage.

Browse Source 
Pathways that only catch internal code errors should use AssertionError so
that they are not included when computing test coverage.
This commit is contained in:
Rishi Gupta
2017-03-11 16:43:51 -08:00
committed by Tim Abbott
parent b18bfe6771
commit ebebd04587
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
analytics/lib/counts.py
View File

@@ -45,7 +45,7 @@ class CountStat(object):
self.filter_args = filter_args self.filter_args = filter_args
self.group_by = group_by self.group_by = group_by
if frequency not in self.FREQUENCIES: if frequency not in self.FREQUENCIES:
raise ValueError("Unknown frequency: %s" % (frequency,)) raise AssertionError("Unknown frequency: %s" % (frequency,))
self.frequency = frequency self.frequency = frequency
self.interval = self.GAUGE if is_gauge else frequency self.interval = self.GAUGE if is_gauge else frequency
self.is_logging = False self.is_logging = False
@@ -92,7 +92,7 @@ def process_count_stat(stat, fill_to_time):
elif fill_state.state == FillState.DONE: elif fill_state.state == FillState.DONE:
currently_filled = fill_state.end_time currently_filled = fill_state.end_time
else: else:
raise ValueError("Unknown value for FillState.state: %s." % (fill_state.state,)) raise AssertionError("Unknown value for FillState.state: %s." % (fill_state.state,))
currently_filled = currently_filled + timedelta(hours = 1) currently_filled = currently_filled + timedelta(hours = 1)
while currently_filled <= fill_to_time: while currently_filled <= fill_to_time:

6
analytics/lib/fixtures.py
View File

@@ -50,10 +50,10 @@ def generate_time_series_data(days=100, business_hours_base=10, non_business_hou
[24*non_business_hours_base] * 2 [24*non_business_hours_base] * 2
holidays = [random() < holiday_rate for i in range(days)] holidays = [random() < holiday_rate for i in range(days)]
else: else:
raise ValueError("Unknown frequency: %s" % (frequency,)) raise AssertionError("Unknown frequency: %s" % (frequency,))
if length < 2: if length < 2:
raise ValueError("Must be generating at least 2 data points. " raise AssertionError("Must be generating at least 2 data points. "
"Currently generating %s" % (length,)) "Currently generating %s" % (length,))
growth_base = growth ** (1. / (length-1)) growth_base = growth ** (1. / (length-1))
values_no_noise = [seasonality[i % len(seasonality)] * (growth_base**i) for i in range(length)] values_no_noise = [seasonality[i % len(seasonality)] * (growth_base**i) for i in range(length)]

2
analytics/lib/time_utils.py
View File

@@ -17,7 +17,7 @@ def time_range(start, end, frequency, min_length):
end = floor_to_day(end) end = floor_to_day(end)
step = timedelta(days=1) step = timedelta(days=1)
else: else:
raise ValueError("Unknown frequency: %s" % (frequency,)) raise AssertionError("Unknown frequency: %s" % (frequency,))
times = [] times = []
if min_length is not None: if min_length is not None:

6
analytics/views.py
View File

@@ -152,7 +152,7 @@ def table_filtered_to_id(table, key_id):
elif table == InstallationCount: elif table == InstallationCount:
return InstallationCount.objects.all() return InstallationCount.objects.all()
else: else:
raise ValueError("Unknown table: %s" % (table,)) raise AssertionError("Unknown table: %s" % (table,))
def client_label_map(name): def client_label_map(name):
# type: (str) -> str # type: (str) -> str
@@ -191,8 +191,8 @@ def rewrite_client_arrays(value_arrays):
def get_time_series_by_subgroup(stat, table, key_id, end_times, subgroups, labels, include_empty_subgroups): def get_time_series_by_subgroup(stat, table, key_id, end_times, subgroups, labels, include_empty_subgroups):
# type: (CountStat, Type[BaseCount], Optional[int], List[datetime], List[str], List[str], bool) -> Dict[str, List[int]] # type: (CountStat, Type[BaseCount], Optional[int], List[datetime], List[str], List[str], bool) -> Dict[str, List[int]]
if len(subgroups) != len(labels): if len(subgroups) != len(labels):
raise ValueError("subgroups and labels have lengths %s and %s, which are different." % raise AssertionError("subgroups and labels have lengths %s and %s, which are different." %
(len(subgroups), len(labels))) (len(subgroups), len(labels)))
queryset = table_filtered_to_id(table, key_id).filter(property=stat.property) \ queryset = table_filtered_to_id(table, key_id).filter(property=stat.property) \
.values_list('subgroup', 'end_time', 'value') .values_list('subgroup', 'end_time', 'value')
value_dicts = defaultdict(lambda: defaultdict(int)) # type: Dict[Optional[str], Dict[datetime, int]] value_dicts = defaultdict(lambda: defaultdict(int)) # type: Dict[Optional[str], Dict[datetime, int]]