From: Ondrej Lichtner <olichtne(a)redhat.com>
Previously no information (or just a reference to the flow object) was
provided during the report_and_evaluate parts of the Perf recipe code.
Now that the Flow object has an acceptable implementation of a __repr__
method we can safely add flow descriptions where relevant.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
.../Perf/Evaluators/BaselineFlowAverageEvaluator.py | 3 ++-
lnst/RecipeCommon/Perf/Evaluators/NonzeroFlowEvaluator.py | 5 ++++-
lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lnst/RecipeCommon/Perf/Evaluators/BaselineFlowAverageEvaluator.py
b/lnst/RecipeCommon/Perf/Evaluators/BaselineFlowAverageEvaluator.py
index 72d0a73..bcaf466 100644
--- a/lnst/RecipeCommon/Perf/Evaluators/BaselineFlowAverageEvaluator.py
+++ b/lnst/RecipeCommon/Perf/Evaluators/BaselineFlowAverageEvaluator.py
@@ -14,7 +14,8 @@ def __init__(self, pass_difference):
def describe_group_results(self, recipe, results):
result = results[0]
return [
- "Flow {} Baseline average evaluation".format(result.flow),
+ "Baseline average evaluation of flow",
+ "{}".format(result.flow),
"Configured {}% difference as acceptable".format(
self._pass_difference
),
diff --git a/lnst/RecipeCommon/Perf/Evaluators/NonzeroFlowEvaluator.py
b/lnst/RecipeCommon/Perf/Evaluators/NonzeroFlowEvaluator.py
index 72b543d..86dc146 100644
--- a/lnst/RecipeCommon/Perf/Evaluators/NonzeroFlowEvaluator.py
+++ b/lnst/RecipeCommon/Perf/Evaluators/NonzeroFlowEvaluator.py
@@ -10,7 +10,10 @@ class NonzeroFlowEvaluator(BaseEvaluator):
def evaluate_results(self, recipe, results):
for flow_results in results:
result = True
- result_text = ["Flow {} Nonzero
evaluation".format(flow_results.flow)]
+ result_text = [
+ "Nonzero evaluation of flow:",
+ "{}".format(flow_results.flow),
+ ]
if flow_results.generator_results.average > 0:
result_text.append("Generator reported non-zero throughput")
else:
diff --git a/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py
b/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py
index bf04201..14f0661 100644
--- a/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py
+++ b/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py
@@ -194,6 +194,7 @@ def _report_flow_results(cls, recipe, flow_results):
receiver_cpu = flow_results.receiver_cpu_stats
desc = []
+ desc.append(str(flow_results.flow))
desc.append("Generator measured throughput: {tput:.2f}
+-{deviation:.2f}({percentage:.2f}%) {unit} per second."
.format(tput=generator.average,
deviation=generator.std_deviation,
--
2.21.0