diff options
Diffstat (limited to 'storperf/tests/db_tests/job_db_test.py')
| -rw-r--r-- | storperf/tests/db_tests/job_db_test.py | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/storperf/tests/db_tests/job_db_test.py b/storperf/tests/db_tests/job_db_test.py index 4620412..92b1482 100644 --- a/storperf/tests/db_tests/job_db_test.py +++ b/storperf/tests/db_tests/job_db_test.py @@ -8,6 +8,7 @@ ############################################################################## from storperf.db.job_db import JobDB +from storperf.workloads.rr import rr import os import sqlite3 import unittest @@ -60,7 +61,7 @@ class JobDBTest(unittest.TestCase): start_time = "12345" mock_calendar.side_effect = (start_time,) mock_uuid.side_effect = (job_id,) - workload_name = "Workload" + workload = rr() db = sqlite3.connect(JobDB.db_name) cursor = db.cursor() @@ -69,26 +70,26 @@ class JobDBTest(unittest.TestCase): """select * from jobs where job_id = ? and workload = ?""", - (job_id, workload_name,)) + (job_id, workload.fullname,)) self.assertEqual(None, row.fetchone(), "Should not have been a row in the db") - self.job.start_workload(workload_name) + self.job.start_workload(workload) cursor.execute( """select job_id, workload, start from jobs where job_id = ? and workload = ?""", - (job_id, workload_name,)) + (job_id, workload.fullname,)) row = cursor.fetchone() self.assertNotEqual(None, row, "Should be a row in the db") self.assertEqual(job_id, row[0], "Did not expect " + str(row[0])) self.assertEqual( - workload_name, row[1], "Did not expect " + str(row[1])) + workload.fullname, row[1], "Did not expect " + str(row[1])) self.assertEqual(start_time, row[2], "Did not expect " + str(row[2])) @mock.patch("uuid.uuid4") @@ -99,10 +100,10 @@ class JobDBTest(unittest.TestCase): end_time = "54321" mock_calendar.side_effect = (start_time, end_time,) mock_uuid.side_effect = (job_id,) - workload_name = "Workload" + workload = rr() - self.job.start_workload(workload_name) - self.job.end_workload(workload_name) + self.job.start_workload(workload) + self.job.end_workload(workload) db = sqlite3.connect(JobDB.db_name) cursor = db.cursor() @@ -110,14 +111,14 @@ class JobDBTest(unittest.TestCase): """select job_id, workload, start, end from jobs where job_id = ? and workload = ?""", - (job_id, workload_name,)) + (job_id, workload.fullname,)) row = cursor.fetchone() self.assertNotEqual(None, row, "Should be a row in the db") self.assertEqual(job_id, row[0], "Did not expect " + str(row[0])) self.assertEqual( - workload_name, row[1], "Did not expect " + str(row[1])) + workload.fullname, row[1], "Did not expect " + str(row[1])) self.assertEqual(start_time, row[2], "Did not expect " + str(row[2])) self.assertEqual(end_time, row[3], "Did not expect " + str(row[3])) @@ -130,26 +131,26 @@ class JobDBTest(unittest.TestCase): mock_calendar.side_effect = (start_time_1, start_time_2) mock_uuid.side_effect = (job_id,) - workload_name = "Workload" + workload = rr() db = sqlite3.connect(JobDB.db_name) cursor = db.cursor() - self.job.start_workload(workload_name) - self.job.start_workload(workload_name) + self.job.start_workload(workload) + self.job.start_workload(workload) cursor.execute( """select job_id, workload, start from jobs where job_id = ? and workload = ?""", - (job_id, workload_name,)) + (job_id, workload.fullname,)) row = cursor.fetchone() self.assertNotEqual(None, row, "Should be a row in the db") self.assertEqual(job_id, row[0], "Did not expect " + str(row[0])) self.assertEqual( - workload_name, row[1], "Did not expect " + str(row[1])) + workload.fullname, row[1], "Did not expect " + str(row[1])) self.assertEqual(start_time_2, row[2], "Did not expect " + str(row[2])) @mock.patch("uuid.uuid4") @@ -160,9 +161,9 @@ class JobDBTest(unittest.TestCase): end_time = "54321" mock_calendar.side_effect = (start_time, end_time,) mock_uuid.side_effect = (job_id,) - workload_name = "Workload" + workload = rr() - self.job.end_workload(workload_name) + self.job.end_workload(workload) db = sqlite3.connect(JobDB.db_name) cursor = db.cursor() @@ -170,14 +171,14 @@ class JobDBTest(unittest.TestCase): """select job_id, workload, start, end from jobs where job_id = ? and workload = ?""", - (job_id, workload_name,)) + (job_id, workload.fullname,)) row = cursor.fetchone() self.assertNotEqual(None, row, "Should be a row in the db") self.assertEqual(job_id, row[0], "Did not expect " + str(row[0])) self.assertEqual( - workload_name, row[1], "Did not expect " + str(row[1])) + workload.fullname, row[1], "Did not expect " + str(row[1])) # The start time is set to the same time as end if it was never set # before self.assertEqual(start_time, row[2], "Did not expect " + str(row[2])) |