From 29cab6cd9d6e669c74a1dd6960aba8250f539c2f Mon Sep 17 00:00:00 2001 From: mbeierl Date: Fri, 20 Jan 2017 16:05:24 -0500 Subject: Fix multiple workload runs Change reporting so that multiple workloads in one job execution can be reported instead of overwriting the previous value. Change the daily job to use a single, multiple workload run. Change-Id: I8e350350ae13d2272b584af7a60ad269de160587 JIRA: STORPERF-98 Signed-off-by: mbeierl --- tests/utilities_tests/data_handler_test.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'tests') diff --git a/tests/utilities_tests/data_handler_test.py b/tests/utilities_tests/data_handler_test.py index b175c87..8115c6d 100644 --- a/tests/utilities_tests/data_handler_test.py +++ b/tests/utilities_tests/data_handler_test.py @@ -57,6 +57,9 @@ class DataHandlerTest(unittest.TestCase): def terminate(self): self._terminated = True + def terminate_current_run(self): + self._terminated = True + @mock.patch("time.time") @mock.patch.dict(os.environ, {'TEST_DB_URL': 'mock'}) @mock.patch("storperf.db.graphite_db.GraphiteDB.fetch_series") @@ -163,18 +166,22 @@ class DataHandlerTest(unittest.TestCase): self.assertEqual(False, self._terminated) self.assertEqual(expected_slope, self.metadata['report_data'] + ['rw.queue-depth.8.block-size.8192'] ['lat.mean'] ['read'] ['slope']) self.assertEqual(expected_range, self.metadata['report_data'] + ['rw.queue-depth.8.block-size.8192'] ['lat.mean'] ['read'] ['range']) self.assertEqual(expected_average, self.metadata['report_data'] + ['rw.queue-depth.8.block-size.8192'] ['lat.mean'] ['read'] ['average']) self.assertEqual(series, self.metadata['report_data'] + ['rw.queue-depth.8.block-size.8192'] ['lat.mean'] ['read'] ['series']) @@ -211,18 +218,22 @@ class DataHandlerTest(unittest.TestCase): self.data_handler.data_event(self) self.assertEqual(expected_slope, self.metadata['report_data'] + ['rw.queue-depth.8.block-size.8192'] ['lat.mean'] ['read'] ['slope']) self.assertEqual(expected_range, self.metadata['report_data'] + ['rw.queue-depth.8.block-size.8192'] ['lat.mean'] ['read'] ['range']) self.assertEqual(expected_average, self.metadata['report_data'] + ['rw.queue-depth.8.block-size.8192'] ['lat.mean'] ['read'] ['average']) self.assertEqual(series, self.metadata['report_data'] + ['rw.queue-depth.8.block-size.8192'] ['lat.mean'] ['read'] ['series']) -- cgit 1.2.3-korg