openstack
/
congress
Code Issues Proposed changes

Change assertTrue(isinstance()) by optimal assert 

Some of tests use different method of assertTrue(isinstance(A, B)) or
assertEqual(type(A), B). The correct way is to use assertIsInstance(A,
B) provided by testtools.

Change-Id: I17efd64bf4031788f03cf46468b77d7072981620
Closes-bug: #1268480
This commit is contained in:
Shuquan Huang 2015-12-31 15:49:57 +08:00
parent 7ea593e51a
commit 89b6fa0665
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
congress/tests/datalog/test_utility.py
View File

@ -111,7 +111,7 @@ class TestGraph(base.TestCase):
self.assertTrue(g.edge_in(1, 2))
self.assertTrue(g.edge_in(2, 3))
self.assertTrue(g.edge_in(3, 4))
self.assertTrue(isinstance(g, utility.Graph))
self.assertIsInstance(g, utility.Graph)
self.assertTrue(g1.edge_in(1, 2))
self.assertTrue(g1.edge_in(2, 3))
self.assertFalse(g1.edge_in(3, 4))
@ -321,7 +321,7 @@ class TestBagGraph(base.TestCase):
self.assertTrue(g.edge_in(2, 3))
self.assertTrue(g.edge_in(3, 4))
self.assertEqual(g.edge_count(2, 3), 2)
self.assertTrue(isinstance(g, utility.Graph))
self.assertIsInstance(g, utility.Graph)
self.assertTrue(g1.edge_in(1, 2))
self.assertTrue(g1.edge_in(2, 3))
self.assertFalse(g1.edge_in(3, 4))
@ -344,7 +344,7 @@ class TestBagGraph(base.TestCase):
self.assertTrue(g1.edge_in(1, 2))
self.assertTrue(g1.edge_in(2, 3))
self.assertTrue(g1.edge_in(3, 4))
self.assertTrue(isinstance(g1, utility.BagGraph))
self.assertIsInstance(g1, utility.BagGraph)
self.assertEqual(g1.edge_count(2, 3), 2)
self.assertFalse(g2.edge_in(1, 2))
self.assertTrue(g2.edge_in(2, 3))

26
congress/tests/policy_engines/test_agnostic.py
View File

@ -132,21 +132,21 @@ class TestRuntime(base.TestCase):
# policy types
run = agnostic.Runtime()
run.create_policy('test1', kind=datalog_base.NONRECURSIVE_POLICY_TYPE)
self.assertTrue(isinstance(run.policy_object('test1'),
nonrecursive.NonrecursiveRuleTheory),
'Nonrecursive policy addition')
self.assertIsInstance(run.policy_object('test1'),
nonrecursive.NonrecursiveRuleTheory,
'Nonrecursive policy addition')
run.create_policy('test2', kind=datalog_base.ACTION_POLICY_TYPE)
self.assertTrue(isinstance(run.policy_object('test2'),
nonrecursive.ActionTheory),
'Action policy addition')
self.assertIsInstance(run.policy_object('test2'),
nonrecursive.ActionTheory,
'Action policy addition')
run.create_policy('test3', kind=datalog_base.DATABASE_POLICY_TYPE)
self.assertTrue(isinstance(run.policy_object('test3'),
database.Database),
'Database policy addition')
self.assertIsInstance(run.policy_object('test3'),
database.Database,
'Database policy addition')
run.create_policy('test4', kind=datalog_base.MATERIALIZED_POLICY_TYPE)
self.assertTrue(isinstance(run.policy_object('test4'),
materialized.MaterializedViewTheory),
'Materialized policy addition')
self.assertIsInstance(run.policy_object('test4'),
materialized.MaterializedViewTheory,
'Materialized policy addition')
def test_policy_errors(self):
"""Test errors for multiple policies."""
@ -170,7 +170,7 @@ class TestRuntime(base.TestCase):
permitted, errs = run.insert('q(5)')
self.assertFalse(permitted)
self.assertEqual(len(errs), 1)
self.assertTrue(isinstance(errs[0], exception.PolicyException))
self.assertIsInstance(errs[0], exception.PolicyException)
# double-check that the error didn't result in an inconsistent state
self.assertEqual(run.select('q(5)'), '')