From acfadc79623d9ac6ec0a625ba69b356b71606252 Mon Sep 17 00:00:00 2001 From: mbeierl Date: Wed, 15 Feb 2017 16:38:29 -0500 Subject: Normalize data series Changes the data series from using seconds to samples so that slope is not artificially flattened. Change-Id: Idf87926a47c2ba67e66e2254d3572adad7a81b44 JIRA: STORPERF-106 Signed-off-by: mbeierl --- tests/utilities_tests/data_handler_test.py | 32 ++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/utilities_tests/data_handler_test.py b/tests/utilities_tests/data_handler_test.py index 90df0f6..93b0b97 100644 --- a/tests/utilities_tests/data_handler_test.py +++ b/tests/utilities_tests/data_handler_test.py @@ -150,8 +150,9 @@ class DataHandlerTest(unittest.TestCase): @mock.patch("time.time") @mock.patch("storperf.db.test_results_db.push_results_to_db") @mock.patch("storperf.db.graphite_db.GraphiteDB.fetch_series") - def test_non_terminated_report(self, mock_graphite_db, mock_results_db, - mock_time): + @mock.patch("storperf.db.graphite_db.JobDB.fetch_workloads") + def test_non_terminated_report(self, mock_job_db, mock_graphite_db, + mock_results_db, mock_time): self._terminated = False mock_results_db.side_effect = self.push_results_to_db series = \ @@ -166,7 +167,7 @@ class DataHandlerTest(unittest.TestCase): [1480456050, 217.75]] mock_graphite_db.return_value = series mock_time.return_value = series[-1][0] + 10 - expected_slope = 0.1185333530108134 + expected_slope = 11.48297119140625 expected_range = 17.78 expected_average = 212.49777777777774 @@ -176,6 +177,8 @@ class DataHandlerTest(unittest.TestCase): 8, 8192)) + mock_job_db.return_value = [[self.current_workload, 4804559000, None]] + self.data_handler.data_event(self) self.assertEqual(False, self.pushed) self.assertEqual(False, self._terminated) @@ -195,17 +198,14 @@ class DataHandlerTest(unittest.TestCase): ['lat.mean'] ['read'] ['average']) - self.assertEqual(series, self.metadata['report_data'] - ['rw.queue-depth.8.block-size.8192'] - ['lat.mean'] - ['read'] - ['series']) @mock.patch.dict(os.environ, {'TEST_DB_URL': 'mock'}) @mock.patch("time.time") @mock.patch("storperf.db.test_results_db.push_results_to_db") @mock.patch("storperf.db.graphite_db.GraphiteDB.fetch_series") + @mock.patch("storperf.db.graphite_db.JobDB.fetch_workloads") def test_report_that_causes_termination(self, + mock_job_db, mock_graphite_db, mock_results_db, mock_time): @@ -221,10 +221,20 @@ class DataHandlerTest(unittest.TestCase): [4804560300, 219.37], [4804560400, 219.28], [4804560500, 217.75]] + report_data = [[2, 205.345], + [4, 201.59], + [6, 205.76], + [7, 205.76], + [9, 205.76], + [11, 205.76], + [12, 205.76], + [22, 219.37], + [24, 219.28], + [26, 217.75]] mock_graphite_db.return_value = series mock_time.return_value = 4804560500 + 10 - expected_slope = 0.01266822319352225 + expected_slope = 0.7318639667704995 expected_range = 17.78 expected_average = 209.2135 @@ -234,6 +244,8 @@ class DataHandlerTest(unittest.TestCase): 8, 8192)) + mock_job_db.return_value = [[self.current_workload, 4804559000, None]] + self.data_handler.data_event(self) self.assertEqual(expected_slope, self.metadata['report_data'] @@ -251,7 +263,7 @@ class DataHandlerTest(unittest.TestCase): ['lat.mean'] ['read'] ['average']) - self.assertEqual(series, self.metadata['report_data'] + self.assertEqual(report_data, self.metadata['report_data'] ['rw.queue-depth.8.block-size.8192'] ['lat.mean'] ['read'] -- cgit 1.2.3-korg