openstack/cinder
Code Issues Proposed changes

Merge "Change assertTrue(isinstance()) with optimal assert"

Browse Source
This commit is contained in:
Jenkins 2016-08-30 13:13:54 +00:00 committed by Gerrit Code Review
commit c570fde6f9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/unit/objects/test_base.py
View File

@ -698,7 +698,7 @@ class TestCinderObjectConditionalUpdate(test.TestCase):
# is not relevant).
self.assertEqual(1, update.call_count)
arg = update.call_args[0][0]
self.assertTrue(isinstance(arg, dict))
self.assertIsInstance(arg, dict)
self.assertEqual(set(values.keys()), set(arg.keys()))
def test_conditional_update_multitable_fail(self):

8
cinder/tests/unit/test_ssh_utils.py
View File

@ -302,8 +302,8 @@ class SSHPoolTestCase(test.TestCase):
max_size=1)
with sshpool.item() as ssh:
self.assertTrue(isinstance(ssh.get_policy(),
paramiko.RejectPolicy))
self.assertIsInstance(ssh.get_policy(),
paramiko.RejectPolicy)
@mock.patch('six.moves.builtins.open')
@mock.patch('paramiko.SSHClient')
@ -322,5 +322,5 @@ class SSHPoolTestCase(test.TestCase):
max_size=1)
with sshpool.item() as ssh:
self.assertTrue(isinstance(ssh.get_policy(),
paramiko.AutoAddPolicy))
self.assertIsInstance(ssh.get_policy(),
paramiko.AutoAddPolicy)

2
cinder/tests/unit/volume/drivers/emc/vnx/test_taskflows.py
View File

@ -165,7 +165,7 @@ class TestTaskflow(test.TestCase):
store=store_spec)
engine.run()
snap_name = engine.storage.fetch('new_cg_snap_name')
self.assertTrue(isinstance(snap_name, res_mock.StorageObjectMock))
self.assertIsInstance(snap_name, res_mock.StorageObjectMock)
@res_mock.patch_client
def test_create_cg_snapshot_task_revert(self, client, mocked):