commit 73c01a476080799fbf57ae6503b16153ff0de4b1 Merge: 8f86202 52e2221 Author: Matt Traudt <sirmatt@ksu.edu> Date: Mon Oct 22 09:43:44 2018 -0400 Merge remote-tracking branch 'juga/ticket28105_fix_recent_results' CHANGELOG.md | 1 + sbws/core/generate.py | 8 ++++++-- sbws/lib/v3bwfile.py | 13 +++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --cc CHANGELOG.md index 78059c3,9464985..90da685 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -16,7 -16,7 +16,8 @@@ and this project adheres to [Semantic V - Move ``examples/`` to ``docs/`` (#28040) - Number of results comparison and number of results away from each other are incorrect (#28041) +- Stop removing results that are not away from some other X secs (#28103) + - Use secs-away when provided instead of data_period (#28105) ## [0.8.0] - 2018-10-08 diff --cc sbws/lib/v3bwfile.py index 8f1e24a,4861af4..8d0e193 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@@ -283,15 -281,12 +283,12 @@@ class V3BWLine(object) results_away = \ cls.results_away_each_other(success_results, secs_away) if not results_away: - log.debug("There are no results with relays' results away from" - " each other {}".format(secs_away)) return None + # log.debug("Results away from each other: %s", + # [unixts_to_isodt_str(r.time) for r in results_away]) results_recent = cls.results_recent_than(results_away, secs_recent) if not results_recent: - log.debug("There are no results that are more recent than {}" - " secs".format(secs_recent)) return None - # the most recent should be the last kwargs['desc_avg_bw_bs'] = \ results_recent[-1].relay_average_bandwidth kwargs['rtt'] = cls.rtt_from_results(results_recent)