openstack/deb-python-taskflow
Code Issues Proposed changes

Fix order of assertEqual for unit.persistence

Browse Source 
First parameter should be the expected value.

Change-Id: If255cc908cf013b6c58f5bf666ccaa50f04f7759
Partial-Bug: #1357117
This commit is contained in:
lin-hua-cheng
2015-10-17 01:29:23 -07:00
parent dd22aff707
commit a6f47a0c57
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
taskflow/tests/unit/persistence/base.py
View File

@@ -149,7 +149,7 @@ class PersistenceTestMixin(object):
with contextlib.closing(self._get_connection()) as conn: with contextlib.closing(self._get_connection()) as conn:
lb2 = conn.get_logbook(lb_id) lb2 = conn.get_logbook(lb_id)
fd2 = lb2.find(fd.uuid) fd2 = lb2.find(fd.uuid)
self.assertEqual(fd2.meta.get('test'), 43) self.assertEqual(43, fd2.meta.get('test'))
def test_flow_detail_lazy_fetch(self): def test_flow_detail_lazy_fetch(self):
lb_id = uuidutils.generate_uuid() lb_id = uuidutils.generate_uuid()
@@ -212,7 +212,7 @@ class PersistenceTestMixin(object):
lb2 = conn.get_logbook(lb_id) lb2 = conn.get_logbook(lb_id)
fd2 = lb2.find(fd.uuid) fd2 = lb2.find(fd.uuid)
td2 = fd2.find(td.uuid) td2 = fd2.find(td.uuid)
self.assertEqual(td2.meta.get('test'), 43) self.assertEqual(43, td2.meta.get('test'))
self.assertIsInstance(td2, models.TaskDetail) self.assertIsInstance(td2, models.TaskDetail)
def test_task_detail_with_failure(self): def test_task_detail_with_failure(self):
@@ -240,9 +240,9 @@ class PersistenceTestMixin(object):
lb2 = conn.get_logbook(lb_id) lb2 = conn.get_logbook(lb_id)
fd2 = lb2.find(fd.uuid) fd2 = lb2.find(fd.uuid)
td2 = fd2.find(td.uuid) td2 = fd2.find(td.uuid)
self.assertEqual(td2.failure.exception_str, 'Woot!') self.assertEqual('Woot!', td2.failure.exception_str)
self.assertIs(td2.failure.check(RuntimeError), RuntimeError) self.assertIs(td2.failure.check(RuntimeError), RuntimeError)
self.assertEqual(td2.failure.traceback_str, td.failure.traceback_str) self.assertEqual(td.failure.traceback_str, td2.failure.traceback_str)
self.assertIsInstance(td2, models.TaskDetail) self.assertIsInstance(td2, models.TaskDetail)
def test_logbook_merge_flow_detail(self): def test_logbook_merge_flow_detail(self):
@@ -312,9 +312,9 @@ class PersistenceTestMixin(object):
fd2 = lb2.find(fd.uuid) fd2 = lb2.find(fd.uuid)
td2 = fd2.find(td.uuid) td2 = fd2.find(td.uuid)
self.assertIsNot(td2, None) self.assertIsNot(td2, None)
self.assertEqual(td2.name, 'detail-1') self.assertEqual('detail-1', td2.name)
self.assertEqual(td2.version, '4.2') self.assertEqual('4.2', td2.version)
self.assertEqual(td2.intention, states.EXECUTE) self.assertEqual(states.EXECUTE, td2.intention)
def test_logbook_delete(self): def test_logbook_delete(self):
lb_id = uuidutils.generate_uuid() lb_id = uuidutils.generate_uuid()
@@ -350,7 +350,7 @@ class PersistenceTestMixin(object):
lb2 = conn.get_logbook(lb_id) lb2 = conn.get_logbook(lb_id)
fd2 = lb2.find(fd.uuid) fd2 = lb2.find(fd.uuid)
rd2 = fd2.find(rd.uuid) rd2 = fd2.find(rd.uuid)
self.assertEqual(rd2.intention, states.REVERT) self.assertEqual(states.REVERT, rd2.intention)
self.assertIsInstance(rd2, models.RetryDetail) self.assertIsInstance(rd2, models.RetryDetail)
def test_retry_detail_save_with_task_failure(self): def test_retry_detail_save_with_task_failure(self):
@@ -405,5 +405,5 @@ class PersistenceTestMixin(object):
lb2 = conn.get_logbook(lb_id) lb2 = conn.get_logbook(lb_id)
fd2 = lb2.find(fd.uuid) fd2 = lb2.find(fd.uuid)
rd2 = fd2.find(rd.uuid) rd2 = fd2.find(rd.uuid)
self.assertEqual(rd2.intention, states.REVERT) self.assertEqual(states.REVERT, rd2.intention)
self.assertIsInstance(rd2, models.RetryDetail) self.assertIsInstance(rd2, models.RetryDetail)