From 54ad18e2ffac806dffda0e0e7ebe22ee1d124622 Mon Sep 17 00:00:00 2001 From: Richard Frank Date: Tue, 11 Mar 2014 18:35:11 -0400 Subject: [PATCH] MAINT: Simplified event stream creation for tests --- tests/test_perf_tracking.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_perf_tracking.py b/tests/test_perf_tracking.py index 7f390c08..31c37dff 100644 --- a/tests/test_perf_tracking.py +++ b/tests/test_perf_tracking.py @@ -73,17 +73,17 @@ def calculate_results(host, events): perf_tracker = perf.PerformanceTracker(host.sim_params) + events = sorted(events, key=lambda ev: ev.dt) all_events = date_sorted_sources(events, host.benchmark_events) - filtered_events = [(filt_event.dt, filt_event) for filt_event - in all_events if filt_event.dt <= events[-1].dt] - filtered_events.sort(key=lambda x: x[0]) - grouped_events = itertools.groupby(filtered_events, lambda x: x[0]) + filtered_events = (filt_event for filt_event in all_events + if filt_event.dt <= events[-1].dt) + grouped_events = itertools.groupby(filtered_events, lambda x: x.dt) results = [] bm_updated = False for date, group in grouped_events: - for _, event in group: + for event in group: perf_tracker.process_event(event) if event.type == DATASOURCE_TYPE.BENCHMARK: bm_updated = True