summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authormbeierl <mark.beierl@dell.com>2017-01-20 16:05:24 -0500
committermbeierl <mark.beierl@dell.com>2017-01-20 16:05:24 -0500
commit29cab6cd9d6e669c74a1dd6960aba8250f539c2f (patch)
tree2f45b65cb23ea50aca6543df1c7cf6fa9eec0fd6 /tests
parent37773383c0ea27a934b9e97788e07276cbaaadcf (diff)
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 <mark.beierl@dell.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/utilities_tests/data_handler_test.py11
1 files changed, 11 insertions, 0 deletions
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'])