diff --git a/docs/changelog.rst b/docs/changelog.rst index 7501935ce5..bd42f48cc7 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -2,6 +2,13 @@ Changelog Highlights #################### +Unreleased +========== + +* Renamed the last row in statistics from "Total" to "Aggregated" (since the values aren't a sum of the + individual table rows). + + For full details of the Locust changelog, please see https://github.com/locustio/locust/blob/master/CHANGELOG.md 0.12.1 diff --git a/locust/static/locust.js b/locust/static/locust.js index a78b8cc368..5a51f1f938 100644 --- a/locust/static/locust.js +++ b/locust/static/locust.js @@ -103,6 +103,7 @@ var report; function renderTable(report) { var totalRow = report.stats.pop(); + totalRow.is_aggregated = true; var sortedStats = (report.stats).sort(sortBy(sortAttribute, desc)); sortedStats.push(totalRow); $('#stats tbody').empty(); diff --git a/locust/stats.py b/locust/stats.py index b49beaf3c9..644f3cb8a0 100644 --- a/locust/stats.py +++ b/locust/stats.py @@ -74,7 +74,7 @@ class RequestStats(object): def __init__(self): self.entries = {} self.errors = {} - self.total = StatsEntry(self, "Total", None, use_response_times_cache=True) + self.total = StatsEntry(self, "Aggregated", None, use_response_times_cache=True) self.start_time = None @property @@ -129,7 +129,7 @@ def clear_all(self): """ Remove all stats entries and errors """ - self.total = StatsEntry(self, "Total", None, use_response_times_cache=True) + self.total = StatsEntry(self, "Aggregated", None, use_response_times_cache=True) self.entries = {} self.errors = {} self.start_time = None @@ -633,7 +633,7 @@ def print_stats(stats): except ZeroDivisionError: fail_percent = 0 - console_logger.info((" %-" + str(STATS_NAME_WIDTH) + "s %7d %12s %42.2f") % ('Total', total_reqs, "%d(%.2f%%)" % (total_failures, fail_percent), total_rps)) + console_logger.info((" %-" + str(STATS_NAME_WIDTH) + "s %7d %12s %42.2f") % ('Aggregated', total_reqs, "%d(%.2f%%)" % (total_failures, fail_percent), total_rps)) console_logger.info("") def print_percentile_stats(stats): diff --git a/locust/templates/index.html b/locust/templates/index.html index 56113cbd11..a249169d5f 100644 --- a/locust/templates/index.html +++ b/locust/templates/index.html @@ -217,7 +217,7 @@

Version