aboutsummaryrefslogtreecommitdiffstats
path: root/yardstick/tests/unit/benchmark
diff options
context:
space:
mode:
authorEmma Foley <emma.l.foley@intel.com>2019-01-25 14:44:20 +0000
committerMyron Sosyak <myronx.sosyak@intel.com>2019-04-03 10:38:37 +0100
commit34276b464ac7a2013d292680e545d25e515bb0cd (patch)
treef7078cb7c153b2de9fc27c054c60fb5cb124317c /yardstick/tests/unit/benchmark
parent6a0ab66ed2890c7236db8ff49cde909f24f5d92a (diff)
Use baro and yardstick metrics in dynamic HTML report
_combine_metrics combines metrics from different sources. This is for use with the ``yardstick report generate-nsb`` command, which will combine yardstick and barometer metrics in the dynamic HTML report. JIRA: YARDSTICK-1593 Change-Id: I87002948ebb4cc88fb0932380bcb9920eb53db58 Signed-off-by: Emma Foley <emma.l.foley@intel.com>
Diffstat (limited to 'yardstick/tests/unit/benchmark')
-rw-r--r--yardstick/tests/unit/benchmark/core/test_report.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/yardstick/tests/unit/benchmark/core/test_report.py b/yardstick/tests/unit/benchmark/core/test_report.py
index f3b17f30a..89fb1e90a 100644
--- a/yardstick/tests/unit/benchmark/core/test_report.py
+++ b/yardstick/tests/unit/benchmark/core/test_report.py
@@ -322,7 +322,6 @@ class ReportTestCase(unittest.TestCase):
'14:11:45.3836': 3600281000,
}
}
- self.maxDiff = None
self.assertEqual(
BARO_EXPECTED_METRICS,
self.rep._get_baro_metrics()