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: I4a5413f9d90d2e581044885a440a46bf3d76598f
Closes-Bug: #1268480
This commit is contained in:
Marcos Lobo 2014-01-17 14:52:25 +01:00
parent 8bc9586056
commit d5e8f1af67
13 changed files with 298 additions and 254 deletions

View File

@ -24,6 +24,10 @@ Nova Specific Commandments
- [N314] vim configuration should not be kept in source files.
- [N315] We do not use @authors tags in source files. We have git to track
authorship.
- [N316] Change assertTrue(isinstance(A, B)) by optimal assert like
assertIsInstance(A, B).
- [N317] Change assertEqual(type(A), B) by optimal assert like
assertIsInstance(A, B)
Creating Unit Tests
-------------------

View File

@ -38,6 +38,12 @@ virt_import_re = re.compile(
virt_config_re = re.compile(
r"CONF\.import_opt\('.*?', 'nova\.virt\.(\w+)('|.)")
author_tag_re = re.compile("^\s*#\s*@?(a|A)uthor:")
asse_trueinst_re = re.compile(
r"(.)*assertTrue\(isinstance\((\w|\.|\'|\"|\[|\])+, "
"(\w|\.|\'|\"|\[|\])+\)\)")
asse_equal_type_re = re.compile(
r"(.)*assertEqual\(type\((\w|\.|\'|\"|\[|\])+\), "
"(\w|\.|\'|\"|\[|\])+\)")
def import_no_db_in_virt(logical_line, filename):
@ -153,6 +159,24 @@ def no_author_tags(physical_line):
return pos, "N315: Don't use author tags"
def assert_true_instance(logical_line):
"""Check for assertTrue(isinstance(a, b)) sentences
N316
"""
if asse_trueinst_re.match(logical_line):
yield (0, "N316: assertTrue(isinstance(a, b)) sentences not allowed")
def assert_equal_type(logical_line):
"""Check for assertEqual(type(A), B) sentences
N317
"""
if asse_equal_type_re.match(logical_line):
yield (0, "N317: assertEqual(type(A), B) sentences not allowed")
def factory(register):
register(import_no_db_in_virt)
register(no_db_session_in_public_api)
@ -162,3 +186,5 @@ def factory(register):
register(capital_cfg_help)
register(no_vi_headers)
register(no_author_tags)
register(assert_true_instance)
register(assert_equal_type)

View File

@ -1302,7 +1302,7 @@ class ComputeManagerBuildInstanceTestCase(test.NoDBTestCase):
self.image, self.block_device_mapping):
pass
except Exception as e:
self.assertTrue(isinstance(e, exception.BuildAbortException))
self.assertIsInstance(e, exception.BuildAbortException)
def test_failed_bdm_prep_from_delete_raises_unexpected(self):
with contextlib.nested(
@ -1320,9 +1320,8 @@ class ComputeManagerBuildInstanceTestCase(test.NoDBTestCase):
self.image, self.block_device_mapping):
pass
except Exception as e:
self.assertTrue(
isinstance(e,
exception.UnexpectedDeletingTaskStateError))
self.assertIsInstance(e,
exception.UnexpectedDeletingTaskStateError)
_build_networks_for_instance.assert_has_calls(
mock.call(self.context, self.instance,
@ -1343,7 +1342,7 @@ class ComputeManagerBuildInstanceTestCase(test.NoDBTestCase):
self.block_device_mapping):
pass
except Exception as e:
self.assertTrue(isinstance(e, exception.BuildAbortException))
self.assertIsInstance(e, exception.BuildAbortException)
def test_failed_network_alloc_from_delete_raises_unexpected(self):
with mock.patch.object(self.compute,
@ -1359,7 +1358,7 @@ class ComputeManagerBuildInstanceTestCase(test.NoDBTestCase):
self.image, self.block_device_mapping):
pass
except Exception as e:
self.assertTrue(isinstance(e, exc))
self.assertIsInstance(e, exc)
_build_networks.assert_has_calls(
mock.call(self.context, self.instance,
@ -1409,7 +1408,7 @@ class ComputeManagerBuildInstanceTestCase(test.NoDBTestCase):
self.image, self.block_device_mapping):
fake_spawn()
except Exception as e:
self.assertTrue(isinstance(e, exception.BuildAbortException))
self.assertIsInstance(e, exception.BuildAbortException)
def test_cleanup_cleans_volumes(self):
self.mox.StubOutWithMock(self.compute, '_cleanup_volumes')

View File

@ -628,8 +628,8 @@ class TestNovaMigrations(BaseWalkMigrationTestCase, CommonTestsMixIn):
self.assertColumnExists(engine, 'compute_nodes', 'metrics')
compute_nodes = db_utils.get_table(engine, 'compute_nodes')
self.assertTrue(isinstance(compute_nodes.c.metrics.type,
sqlalchemy.types.Text))
self.assertIsInstance(compute_nodes.c.metrics.type,
sqlalchemy.types.Text)
def _post_downgrade_228(self, engine):
self.assertColumnNotExists(engine, 'compute_nodes', 'metrics')
@ -638,8 +638,8 @@ class TestNovaMigrations(BaseWalkMigrationTestCase, CommonTestsMixIn):
self.assertColumnExists(engine, 'compute_nodes', 'extra_resources')
compute_nodes = db_utils.get_table(engine, 'compute_nodes')
self.assertTrue(isinstance(compute_nodes.c.extra_resources.type,
sqlalchemy.types.Text))
self.assertIsInstance(compute_nodes.c.extra_resources.type,
sqlalchemy.types.Text)
def _post_downgrade_229(self, engine):
self.assertColumnNotExists(engine, 'compute_nodes', 'extra_resources')
@ -651,10 +651,10 @@ class TestNovaMigrations(BaseWalkMigrationTestCase, CommonTestsMixIn):
self.assertColumnExists(engine, table_name, 'details')
action_events = db_utils.get_table(engine, 'instance_actions_events')
self.assertTrue(isinstance(action_events.c.host.type,
sqlalchemy.types.String))
self.assertTrue(isinstance(action_events.c.details.type,
sqlalchemy.types.Text))
self.assertIsInstance(action_events.c.host.type,
sqlalchemy.types.String)
self.assertIsInstance(action_events.c.details.type,
sqlalchemy.types.Text)
def _post_downgrade_230(self, engine):
for table_name in ['instance_actions_events',
@ -666,8 +666,8 @@ class TestNovaMigrations(BaseWalkMigrationTestCase, CommonTestsMixIn):
self.assertColumnExists(engine, 'instances', 'ephemeral_key_uuid')
instances = db_utils.get_table(engine, 'instances')
self.assertTrue(isinstance(instances.c.ephemeral_key_uuid.type,
sqlalchemy.types.String))
self.assertIsInstance(instances.c.ephemeral_key_uuid.type,
sqlalchemy.types.String)
self.assertTrue(db_utils.check_shadow_table(engine, 'instances'))
def _post_downgrade_231(self, engine):
@ -685,8 +685,8 @@ class TestNovaMigrations(BaseWalkMigrationTestCase, CommonTestsMixIn):
self.assertColumnExists(engine, 'compute_nodes', 'stats')
compute_nodes = db_utils.get_table(engine, 'compute_nodes')
self.assertTrue(isinstance(compute_nodes.c.stats.type,
sqlalchemy.types.Text))
self.assertIsInstance(compute_nodes.c.stats.type,
sqlalchemy.types.Text)
self.assertRaises(sqlalchemy.exc.NoSuchTableError, db_utils.get_table,
engine, 'compute_node_stats')

View File

@ -62,7 +62,7 @@ class AliasTestCase(test.NoDBTestCase):
def test_good_alias(self):
self.flags(pci_alias=[_fake_alias1])
als = pci_request._get_alias_from_config()
self.assertEqual(type(als['QuicAssist']), list)
self.assertIsInstance(als['QuicAssist'], list)
expect_dict = {
"capability_type": "pci",
"product_id": "4443",
@ -74,7 +74,7 @@ class AliasTestCase(test.NoDBTestCase):
def test_multispec_alias(self):
self.flags(pci_alias=[_fake_alias1, _fake_alias11])
als = pci_request._get_alias_from_config()
self.assertEqual(type(als['QuicAssist']), list)
self.assertIsInstance(als['QuicAssist'], list)
expect_dict1 = {
"capability_type": "pci",
"product_id": "4443",

View File

@ -65,7 +65,7 @@ class SchedulerUtilsTestCase(test.NoDBTestCase):
request_spec = scheduler_utils.build_request_spec(self.context, None,
[instance])
self.assertTrue(isinstance(request_spec['instance_properties'], dict))
self.assertIsInstance(request_spec['instance_properties'], dict)
def _test_set_vm_state_and_notify(self, request_spec,
expected_uuids):

View File

@ -125,9 +125,9 @@ class AvailabilityZoneTestCases(test.TestCase):
service = self._create_service_with_topic('network', self.host)
services = db.service_get_all(self.context)
new_service = az.set_availability_zones(self.context, services)[0]
self.assertEqual(type(services[0]['host']), unicode)
self.assertIsInstance(services[0]['host'], unicode)
cached_key = az._make_cache_key(services[0]['host'])
self.assertEqual(type(cached_key), str)
self.assertIsInstance(cached_key, str)
self._destroy_service(service)
def test_set_availability_zone_not_compute_service(self):

View File

@ -55,3 +55,18 @@ class HackingTestCase(test.NoDBTestCase):
self.assertTrue(checks.no_author_tags("# @Author: jogo"))
self.assertTrue(checks.no_author_tags("# Author: jogo"))
self.assertFalse(checks.no_author_tags("# authorization of this"))
def test_assert_true_instance(self):
self.assertEqual(len(list(checks.assert_true_instance(
"self.assertTrue(isinstance(e, "
"exception.BuildAbortException))"))), 1)
self.assertEqual(
len(list(checks.assert_true_instance("self.assertTrue()"))), 0)
def test_assert_equal_type(self):
self.assertEqual(len(list(checks.assert_equal_type(
"self.assertEqual(type(als['QuicAssist']), list)"))), 1)
self.assertEqual(
len(list(checks.assert_equal_type("self.assertTrue()"))), 0)

View File

@ -196,10 +196,10 @@ class BareMetalLibVirtVolumeDriverTestCase(test.TestCase):
self.tid = 100
def test_init_loads_volume_drivers(self):
self.assertEqual(type(self.driver.volume_drivers['fake']),
libvirt_volume.LibvirtFakeVolumeDriver)
self.assertEqual(type(self.driver.volume_drivers['fake2']),
libvirt_volume.LibvirtFakeVolumeDriver)
self.assertIsInstance(self.driver.volume_drivers['fake'],
libvirt_volume.LibvirtFakeVolumeDriver)
self.assertIsInstance(self.driver.volume_drivers['fake2'],
libvirt_volume.LibvirtFakeVolumeDriver)
self.assertEqual(len(self.driver.volume_drivers), 2)
def test_fake_connect_volume(self):

View File

@ -851,33 +851,33 @@ class LibvirtConnTestCase(test.TestCase):
self.assertEqual(cfg.os_boot_dev, ["hd"])
self.assertIsNone(cfg.os_root)
self.assertEqual(len(cfg.devices), 8)
self.assertEqual(type(cfg.devices[0]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[1]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestInterface)
self.assertEqual(type(cfg.devices[3]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[4]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[5]),
vconfig.LibvirtConfigGuestInput)
self.assertEqual(type(cfg.devices[6]),
vconfig.LibvirtConfigGuestGraphics)
self.assertEqual(type(cfg.devices[7]),
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[0],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[1],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestInterface)
self.assertIsInstance(cfg.devices[3],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[4],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[5],
vconfig.LibvirtConfigGuestInput)
self.assertIsInstance(cfg.devices[6],
vconfig.LibvirtConfigGuestGraphics)
self.assertIsInstance(cfg.devices[7],
vconfig.LibvirtConfigGuestVideo)
self.assertEqual(type(cfg.clock),
vconfig.LibvirtConfigGuestClock)
self.assertIsInstance(cfg.clock,
vconfig.LibvirtConfigGuestClock)
self.assertEqual(cfg.clock.offset, "utc")
self.assertEqual(len(cfg.clock.timers), 3)
self.assertEqual(type(cfg.clock.timers[0]),
vconfig.LibvirtConfigGuestTimer)
self.assertEqual(type(cfg.clock.timers[1]),
vconfig.LibvirtConfigGuestTimer)
self.assertEqual(type(cfg.clock.timers[2]),
vconfig.LibvirtConfigGuestTimer)
self.assertIsInstance(cfg.clock.timers[0],
vconfig.LibvirtConfigGuestTimer)
self.assertIsInstance(cfg.clock.timers[1],
vconfig.LibvirtConfigGuestTimer)
self.assertIsInstance(cfg.clock.timers[2],
vconfig.LibvirtConfigGuestTimer)
self.assertEqual(cfg.clock.timers[0].name, "pit")
self.assertEqual(cfg.clock.timers[0].tickpolicy,
"delay")
@ -898,8 +898,8 @@ class LibvirtConnTestCase(test.TestCase):
_fake_network_info(self.stubs, 1),
None, disk_info)
self.assertEqual(type(cfg.clock),
vconfig.LibvirtConfigGuestClock)
self.assertIsInstance(cfg.clock,
vconfig.LibvirtConfigGuestClock)
self.assertEqual(cfg.clock.offset, "localtime")
def test_get_guest_config_with_two_nics(self):
@ -918,24 +918,24 @@ class LibvirtConnTestCase(test.TestCase):
self.assertEqual(cfg.os_boot_dev, ["hd"])
self.assertIsNone(cfg.os_root)
self.assertEqual(len(cfg.devices), 9)
self.assertEqual(type(cfg.devices[0]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[1]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestInterface)
self.assertEqual(type(cfg.devices[3]),
vconfig.LibvirtConfigGuestInterface)
self.assertEqual(type(cfg.devices[4]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[5]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[6]),
vconfig.LibvirtConfigGuestInput)
self.assertEqual(type(cfg.devices[7]),
vconfig.LibvirtConfigGuestGraphics)
self.assertEqual(type(cfg.devices[8]),
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[0],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[1],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestInterface)
self.assertIsInstance(cfg.devices[3],
vconfig.LibvirtConfigGuestInterface)
self.assertIsInstance(cfg.devices[4],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[5],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[6],
vconfig.LibvirtConfigGuestInput)
self.assertIsInstance(cfg.devices[7],
vconfig.LibvirtConfigGuestGraphics)
self.assertIsInstance(cfg.devices[8],
vconfig.LibvirtConfigGuestVideo)
def test_get_guest_config_bug_1118829(self):
self.flags(virt_type='uml', group='libvirt')
@ -978,12 +978,12 @@ class LibvirtConnTestCase(test.TestCase):
self.assertEqual(cfg.os_boot_dev, [])
self.assertEqual(cfg.os_root, '/dev/vdb')
self.assertEqual(len(cfg.devices), 3)
self.assertEqual(type(cfg.devices[0]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[1]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestConsole)
self.assertIsInstance(cfg.devices[0],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[1],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestConsole)
def test_get_guest_config_with_block_device(self):
conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
@ -998,11 +998,11 @@ class LibvirtConnTestCase(test.TestCase):
instance_ref, info)
cfg = conn.get_guest_config(instance_ref, [], None, disk_info,
None, info)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(cfg.devices[2].target_dev, 'vdc')
self.assertEqual(type(cfg.devices[3]),
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[3],
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(cfg.devices[3].target_dev, 'vdd')
def test_get_guest_config_with_configdrive(self):
@ -1016,8 +1016,8 @@ class LibvirtConnTestCase(test.TestCase):
instance_ref)
cfg = conn.get_guest_config(instance_ref, [], None, disk_info)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(cfg.devices[2].target_dev, 'hdd')
def test_get_guest_config_with_vnc(self):
@ -1034,18 +1034,18 @@ class LibvirtConnTestCase(test.TestCase):
instance_ref)
cfg = conn.get_guest_config(instance_ref, [], None, disk_info)
self.assertEqual(len(cfg.devices), 6)
self.assertEqual(type(cfg.devices[0]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[1]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[3]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[4]),
vconfig.LibvirtConfigGuestGraphics)
self.assertEqual(type(cfg.devices[5]),
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[0],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[1],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[3],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[4],
vconfig.LibvirtConfigGuestGraphics)
self.assertIsInstance(cfg.devices[5],
vconfig.LibvirtConfigGuestVideo)
self.assertEqual(cfg.devices[4].type, "vnc")
@ -1063,20 +1063,20 @@ class LibvirtConnTestCase(test.TestCase):
instance_ref)
cfg = conn.get_guest_config(instance_ref, [], None, disk_info)
self.assertEqual(len(cfg.devices), 7)
self.assertEqual(type(cfg.devices[0]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[1]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[3]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[4]),
vconfig.LibvirtConfigGuestInput)
self.assertEqual(type(cfg.devices[5]),
vconfig.LibvirtConfigGuestGraphics)
self.assertEqual(type(cfg.devices[6]),
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[0],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[1],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[3],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[4],
vconfig.LibvirtConfigGuestInput)
self.assertIsInstance(cfg.devices[5],
vconfig.LibvirtConfigGuestGraphics)
self.assertIsInstance(cfg.devices[6],
vconfig.LibvirtConfigGuestVideo)
self.assertEqual(cfg.devices[4].type, "tablet")
self.assertEqual(cfg.devices[5].type, "vnc")
@ -1097,20 +1097,20 @@ class LibvirtConnTestCase(test.TestCase):
instance_ref)
cfg = conn.get_guest_config(instance_ref, [], None, disk_info)
self.assertEqual(len(cfg.devices), 7)
self.assertEqual(type(cfg.devices[0]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[1]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[3]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[4]),
vconfig.LibvirtConfigGuestInput)
self.assertEqual(type(cfg.devices[5]),
vconfig.LibvirtConfigGuestGraphics)
self.assertEqual(type(cfg.devices[6]),
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[0],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[1],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[3],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[4],
vconfig.LibvirtConfigGuestInput)
self.assertIsInstance(cfg.devices[5],
vconfig.LibvirtConfigGuestGraphics)
self.assertIsInstance(cfg.devices[6],
vconfig.LibvirtConfigGuestVideo)
self.assertEqual(cfg.devices[4].type, "tablet")
self.assertEqual(cfg.devices[5].type, "spice")
@ -1131,20 +1131,20 @@ class LibvirtConnTestCase(test.TestCase):
instance_ref)
cfg = conn.get_guest_config(instance_ref, [], None, disk_info)
self.assertEqual(len(cfg.devices), 7)
self.assertEqual(type(cfg.devices[0]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[1]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[3]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[4]),
vconfig.LibvirtConfigGuestChannel)
self.assertEqual(type(cfg.devices[5]),
vconfig.LibvirtConfigGuestGraphics)
self.assertEqual(type(cfg.devices[6]),
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[0],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[1],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[3],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[4],
vconfig.LibvirtConfigGuestChannel)
self.assertIsInstance(cfg.devices[5],
vconfig.LibvirtConfigGuestGraphics)
self.assertIsInstance(cfg.devices[6],
vconfig.LibvirtConfigGuestVideo)
self.assertEqual(cfg.devices[4].target_name, "com.redhat.spice.0")
self.assertEqual(cfg.devices[5].type, "spice")
@ -1165,16 +1165,16 @@ class LibvirtConnTestCase(test.TestCase):
instance_ref)
cfg = conn.get_guest_config(instance_ref, [], None, disk_info)
self.assertEqual(len(cfg.devices), 5)
self.assertEqual(type(cfg.devices[0]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[1]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestConsole)
self.assertEqual(type(cfg.devices[3]),
vconfig.LibvirtConfigGuestGraphics)
self.assertEqual(type(cfg.devices[4]),
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[0],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[1],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestConsole)
self.assertIsInstance(cfg.devices[3],
vconfig.LibvirtConfigGuestGraphics)
self.assertIsInstance(cfg.devices[4],
vconfig.LibvirtConfigGuestVideo)
self.assertEqual(cfg.devices[3].type, "vnc")
self.assertEqual(cfg.devices[4].type, "xen")
@ -1195,24 +1195,24 @@ class LibvirtConnTestCase(test.TestCase):
instance_ref)
cfg = conn.get_guest_config(instance_ref, [], None, disk_info)
self.assertEqual(len(cfg.devices), 9)
self.assertEqual(type(cfg.devices[0]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[1]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[3]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[4]),
vconfig.LibvirtConfigGuestInput)
self.assertEqual(type(cfg.devices[5]),
vconfig.LibvirtConfigGuestChannel)
self.assertEqual(type(cfg.devices[6]),
vconfig.LibvirtConfigGuestGraphics)
self.assertEqual(type(cfg.devices[7]),
vconfig.LibvirtConfigGuestGraphics)
self.assertEqual(type(cfg.devices[8]),
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[0],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[1],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[3],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[4],
vconfig.LibvirtConfigGuestInput)
self.assertIsInstance(cfg.devices[5],
vconfig.LibvirtConfigGuestChannel)
self.assertIsInstance(cfg.devices[6],
vconfig.LibvirtConfigGuestGraphics)
self.assertIsInstance(cfg.devices[7],
vconfig.LibvirtConfigGuestGraphics)
self.assertIsInstance(cfg.devices[8],
vconfig.LibvirtConfigGuestVideo)
self.assertEqual(cfg.devices[4].type, "tablet")
self.assertEqual(cfg.devices[5].target_name, "com.redhat.spice.0")
@ -1246,20 +1246,20 @@ class LibvirtConnTestCase(test.TestCase):
image_meta = {"properties": {"hw_video_model": "vmvga"}}
cfg = conn.get_guest_config(instance_ref, [], image_meta, disk_info)
self.assertEqual(len(cfg.devices), 7)
self.assertEqual(type(cfg.devices[0]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[1]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[3]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[4]),
vconfig.LibvirtConfigGuestInput)
self.assertEqual(type(cfg.devices[5]),
vconfig.LibvirtConfigGuestGraphics)
self.assertEqual(type(cfg.devices[6]),
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[0],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[1],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[3],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[4],
vconfig.LibvirtConfigGuestInput)
self.assertIsInstance(cfg.devices[5],
vconfig.LibvirtConfigGuestGraphics)
self.assertIsInstance(cfg.devices[6],
vconfig.LibvirtConfigGuestVideo)
self.assertEqual(cfg.devices[5].type, "vnc")
self.assertEqual(cfg.devices[6].type, "vmvga")
@ -1275,22 +1275,22 @@ class LibvirtConnTestCase(test.TestCase):
image_meta = {"properties": {"hw_qemu_guest_agent": "yes"}}
cfg = conn.get_guest_config(instance_ref, [], image_meta, disk_info)
self.assertEqual(len(cfg.devices), 8)
self.assertEqual(type(cfg.devices[0]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[1]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[3]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[4]),
vconfig.LibvirtConfigGuestInput)
self.assertEqual(type(cfg.devices[5]),
vconfig.LibvirtConfigGuestGraphics)
self.assertEqual(type(cfg.devices[6]),
vconfig.LibvirtConfigGuestVideo)
self.assertEqual(type(cfg.devices[7]),
vconfig.LibvirtConfigGuestChannel)
self.assertIsInstance(cfg.devices[0],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[1],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[3],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[4],
vconfig.LibvirtConfigGuestInput)
self.assertIsInstance(cfg.devices[5],
vconfig.LibvirtConfigGuestGraphics)
self.assertIsInstance(cfg.devices[6],
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[7],
vconfig.LibvirtConfigGuestChannel)
self.assertEqual(cfg.devices[4].type, "tablet")
self.assertEqual(cfg.devices[5].type, "vnc")
@ -1308,20 +1308,20 @@ class LibvirtConnTestCase(test.TestCase):
image_meta = {"properties": {"hw_qemu_guest_agent": "no"}}
cfg = conn.get_guest_config(instance_ref, [], image_meta, disk_info)
self.assertEqual(len(cfg.devices), 7)
self.assertEqual(type(cfg.devices[0]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[1]),
vconfig.LibvirtConfigGuestDisk)
self.assertEqual(type(cfg.devices[2]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[3]),
vconfig.LibvirtConfigGuestSerial)
self.assertEqual(type(cfg.devices[4]),
vconfig.LibvirtConfigGuestInput)
self.assertEqual(type(cfg.devices[5]),
vconfig.LibvirtConfigGuestGraphics)
self.assertEqual(type(cfg.devices[6]),
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[0],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[1],
vconfig.LibvirtConfigGuestDisk)
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[3],
vconfig.LibvirtConfigGuestSerial)
self.assertIsInstance(cfg.devices[4],
vconfig.LibvirtConfigGuestInput)
self.assertIsInstance(cfg.devices[5],
vconfig.LibvirtConfigGuestGraphics)
self.assertIsInstance(cfg.devices[6],
vconfig.LibvirtConfigGuestVideo)
self.assertEqual(cfg.devices[4].type, "tablet")
self.assertEqual(cfg.devices[5].type, "vnc")
@ -1463,8 +1463,8 @@ class LibvirtConnTestCase(test.TestCase):
cfg = conn.get_guest_config(instance_ref, [],
image_meta,
disk_info)
self.assertEqual(type(cfg.devices[device_index]),
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[device_index],
vconfig.LibvirtConfigGuestVideo)
self.assertEqual(cfg.devices[device_index].type, 'vga')
def test_get_guest_config_ppc64_through_image_meta_vnc_enabled(self):
@ -1508,8 +1508,8 @@ class LibvirtConnTestCase(test.TestCase):
conf = conn.get_guest_config(instance_ref,
_fake_network_info(self.stubs, 1),
None, disk_info)
self.assertEqual(type(conf.cpu),
vconfig.LibvirtConfigGuestCPU)
self.assertIsInstance(conf.cpu,
vconfig.LibvirtConfigGuestCPU)
self.assertEqual(conf.cpu.mode, "host-model")
self.assertIsNone(conf.cpu.model)
@ -1559,8 +1559,8 @@ class LibvirtConnTestCase(test.TestCase):
conf = conn.get_guest_config(instance_ref,
_fake_network_info(self.stubs, 1),
None, disk_info)
self.assertEqual(type(conf.cpu),
vconfig.LibvirtConfigGuestCPU)
self.assertIsInstance(conf.cpu,
vconfig.LibvirtConfigGuestCPU)
self.assertEqual(conf.cpu.mode, "host-passthrough")
self.assertIsNone(conf.cpu.model)
@ -1580,8 +1580,8 @@ class LibvirtConnTestCase(test.TestCase):
conf = conn.get_guest_config(instance_ref,
_fake_network_info(self.stubs, 1),
None, disk_info)
self.assertEqual(type(conf.cpu),
vconfig.LibvirtConfigGuestCPU)
self.assertIsInstance(conf.cpu,
vconfig.LibvirtConfigGuestCPU)
self.assertEqual(conf.cpu.mode, "host-model")
self.assertIsNone(conf.cpu.model)
@ -1603,8 +1603,8 @@ class LibvirtConnTestCase(test.TestCase):
conf = conn.get_guest_config(instance_ref,
_fake_network_info(self.stubs, 1),
None, disk_info)
self.assertEqual(type(conf.cpu),
vconfig.LibvirtConfigGuestCPU)
self.assertIsInstance(conf.cpu,
vconfig.LibvirtConfigGuestCPU)
self.assertEqual(conf.cpu.mode, "custom")
self.assertEqual(conf.cpu.model, "Penryn")
@ -1661,8 +1661,8 @@ class LibvirtConnTestCase(test.TestCase):
conf = conn.get_guest_config(instance_ref,
_fake_network_info(self.stubs, 1),
None, disk_info)
self.assertEqual(type(conf.cpu),
vconfig.LibvirtConfigGuestCPU)
self.assertIsInstance(conf.cpu,
vconfig.LibvirtConfigGuestCPU)
self.assertIsNone(conf.cpu.mode)
self.assertEqual(conf.cpu.model, "Opteron_G4")
self.assertEqual(conf.cpu.vendor, "AMD")
@ -1688,8 +1688,8 @@ class LibvirtConnTestCase(test.TestCase):
conf = conn.get_guest_config(instance_ref,
_fake_network_info(self.stubs, 1),
None, disk_info)
self.assertEqual(type(conf.cpu),
vconfig.LibvirtConfigGuestCPU)
self.assertIsInstance(conf.cpu,
vconfig.LibvirtConfigGuestCPU)
self.assertIsNone(conf.cpu.mode)
self.assertEqual(conf.cpu.model, "Penryn")
@ -5794,7 +5794,7 @@ class LibvirtConnTestCase(test.TestCase):
conn)
conn._dispatch_events()
self.assertEqual(len(got_events), 1)
self.assertEqual(type(got_events[0]), virtevent.LifecycleEvent)
self.assertIsInstance(got_events[0], virtevent.LifecycleEvent)
self.assertEqual(got_events[0].uuid,
"cef19ce0-0ca2-11df-855d-b19fbce37686")
self.assertEqual(got_events[0].transition,

View File

@ -84,7 +84,7 @@ class LibvirtConfigCapsTest(LibvirtConfigBaseTest):
obj = config.LibvirtConfigCaps()
obj.parse_str(xmlin)
self.assertEqual(type(obj.host), config.LibvirtConfigCapsHost)
self.assertIsInstance(obj.host, config.LibvirtConfigCapsHost)
self.assertEqual(obj.host.uuid, "c7a5fdbd-edaf-9455-926a-d65c16db1809")
xmlout = obj.to_xml()
@ -1159,8 +1159,8 @@ class LibvirtConfigGuestTest(LibvirtConfigBaseTest):
obj = config.LibvirtConfigGuest()
obj.parse_str(xmldoc)
self.assertEqual(len(obj.devices), 1)
self.assertEqual(type(obj.devices[0]),
config.LibvirtConfigGuestHostdevPCI)
self.assertIsInstance(obj.devices[0],
config.LibvirtConfigGuestHostdevPCI)
self.assertEqual(obj.devices[0].mode, 'subsystem')
self.assertEqual(obj.devices[0].managed, 'no')
@ -1283,10 +1283,10 @@ class LibvirtConfigNodeDeviceTest(LibvirtConfigBaseTest):
obj = config.LibvirtConfigNodeDevice()
obj.parse_str(xmlin)
self.assertEqual(type(obj.pci_capability),
config.LibvirtConfigNodeDevicePciCap)
self.assertEqual(type(obj.pci_capability.fun_capability[0]),
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertIsInstance(obj.pci_capability,
config.LibvirtConfigNodeDevicePciCap)
self.assertIsInstance(obj.pci_capability.fun_capability[0],
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertEqual(obj.pci_capability.fun_capability[0].type,
"virt_functions")
self.assertEqual(len(obj.pci_capability.fun_capability[0].
@ -1318,10 +1318,10 @@ class LibvirtConfigNodeDeviceTest(LibvirtConfigBaseTest):
obj = config.LibvirtConfigNodeDevice()
obj.parse_str(xmlin)
self.assertEqual(type(obj.pci_capability),
config.LibvirtConfigNodeDevicePciCap)
self.assertEqual(type(obj.pci_capability.fun_capability[0]),
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertIsInstance(obj.pci_capability,
config.LibvirtConfigNodeDevicePciCap)
self.assertIsInstance(obj.pci_capability.fun_capability[0],
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertEqual(obj.pci_capability.fun_capability[0].type,
"phys_function")
self.assertEqual(len(obj.pci_capability.fun_capability[0].
@ -1350,10 +1350,10 @@ class LibvirtConfigNodeDeviceTest(LibvirtConfigBaseTest):
obj = config.LibvirtConfigNodeDevice()
obj.parse_str(xmlin)
self.assertEqual(type(obj.pci_capability),
config.LibvirtConfigNodeDevicePciCap)
self.assertEqual(type(obj.pci_capability.fun_capability[0]),
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertIsInstance(obj.pci_capability,
config.LibvirtConfigNodeDevicePciCap)
self.assertIsInstance(obj.pci_capability.fun_capability[0],
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertEqual(obj.pci_capability.fun_capability[0].type,
"virt_functions")
@ -1380,10 +1380,10 @@ class LibvirtConfigNodeDeviceTest(LibvirtConfigBaseTest):
obj = config.LibvirtConfigNodeDevice()
obj.parse_str(xmlin)
self.assertEqual(type(obj.pci_capability),
config.LibvirtConfigNodeDevicePciCap)
self.assertEqual(type(obj.pci_capability.fun_capability[0]),
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertIsInstance(obj.pci_capability,
config.LibvirtConfigNodeDevicePciCap)
self.assertIsInstance(obj.pci_capability.fun_capability[0],
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertEqual(obj.pci_capability.fun_capability[0].type,
"virt_functions")
@ -1414,10 +1414,10 @@ class LibvirtConfigNodeDeviceTest(LibvirtConfigBaseTest):
obj = config.LibvirtConfigNodeDevice()
obj.parse_str(xmlin)
self.assertEqual(type(obj.pci_capability),
config.LibvirtConfigNodeDevicePciCap)
self.assertEqual(type(obj.pci_capability.fun_capability[0]),
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertIsInstance(obj.pci_capability,
config.LibvirtConfigNodeDevicePciCap)
self.assertIsInstance(obj.pci_capability.fun_capability[0],
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertEqual(obj.pci_capability.fun_capability[0].type,
"phys_function")
self.assertEqual(obj.pci_capability.fun_capability[1].type,
@ -1451,8 +1451,8 @@ class LibvirtConfigNodeDevicePciCapTest(LibvirtConfigBaseTest):
self.assertEqual(obj.product_id, '0x8086-3')
self.assertEqual(obj.vendor, "Intel Inc.")
self.assertEqual(obj.vendor_id, "0x8086")
self.assertEqual(type(obj.fun_capability[0]),
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertIsInstance(obj.fun_capability[0],
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertEqual(obj.fun_capability[0].type, 'virt_functions')
self.assertEqual(obj.fun_capability[0].device_addrs,
@ -1487,8 +1487,8 @@ class LibvirtConfigNodeDevicePciCapTest(LibvirtConfigBaseTest):
self.assertEqual(obj.product_id, '0x8086-3')
self.assertEqual(obj.vendor, "Intel Inc.")
self.assertEqual(obj.vendor_id, "0x8086")
self.assertEqual(type(obj.fun_capability[0]),
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertIsInstance(obj.fun_capability[0],
config.LibvirtConfigNodeDevicePciSubFunctionCap)
self.assertEqual(obj.fun_capability[0].type, 'virt_functions')
self.assertEqual(obj.fun_capability[0].device_addrs,

View File

@ -583,7 +583,7 @@ class _VirtDriverTestCase(_FakeDriverBackendTestCase):
def test_get_host_stats(self):
host_status = self.connection.get_host_stats()
self._check_available_resource_fields(host_status)
self.assertTrue(isinstance(host_status['hypervisor_version'], int))
self.assertIsInstance(host_status['hypervisor_version'], int)
@catch_notimplementederror
def test_get_available_resource(self):

View File

@ -620,7 +620,7 @@ class MigrateDiskAndPowerOffTestCase(VMOpsTestBase):
class MigrateDiskResizingUpTestCase(VMOpsTestBase):
def _fake_snapshot_attached_here(self, session, instance, vm_ref, label,
userdevice, post_snapshot_callback):
self.assertTrue(isinstance(instance, dict))
self.assertIsInstance(instance, dict)
if userdevice == '0':
self.assertEqual("vm_ref", vm_ref)
self.assertEqual("fake-snapshot", label)