openstack
/
nova
Code Issues Proposed changes

Merge "Fix misuse of assertIsNone" into stable/ocata

This commit is contained in:
Jenkins 2017-08-12 06:17:25 +00:00 committed by Gerrit Code Review
parent 6895b21b94 2ea000061c
commit 807ffb576e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/tests/functional/wsgi/test_servers.py
View File

@ -68,8 +68,8 @@ class ServersPreSchedulingTestCase(test.TestCase):
self.assertEqual(image_ref, server['image']['id'])
self.assertEqual('1', server['flavor']['id'])
self.assertEqual('', server['hostId'])
self.assertIsNone(None, server['OS-SRV-USG:launched_at'])
self.assertIsNone(None, server['OS-SRV-USG:terminated_at'])
self.assertIsNone(server['OS-SRV-USG:launched_at'])
self.assertIsNone(server['OS-SRV-USG:terminated_at'])
self.assertFalse(server['locked'])
self.assertEqual([], server['tags'])
self.assertEqual('scheduling', server['OS-EXT-STS:task_state'])
@ -95,8 +95,8 @@ class ServersPreSchedulingTestCase(test.TestCase):
self.assertEqual(image_ref, server['image']['id'])
self.assertEqual('1', server['flavor']['id'])
self.assertEqual('', server['hostId'])
self.assertIsNone(None, server['OS-SRV-USG:launched_at'])
self.assertIsNone(None, server['OS-SRV-USG:terminated_at'])
self.assertIsNone(server['OS-SRV-USG:launched_at'])
self.assertIsNone(server['OS-SRV-USG:terminated_at'])
self.assertFalse(server['locked'])
self.assertEqual([], server['tags'])
self.assertEqual('scheduling', server['OS-EXT-STS:task_state'])

2
nova/tests/unit/conductor/test_conductor.py
View File

@ -1538,7 +1538,7 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
instance = objects.Instance.get_by_uuid(
self.ctxt, self.params['build_requests'][0].instance_uuid)
self.assertEqual('error', instance.vm_state)
self.assertIsNone(None, instance.task_state)
self.assertIsNone(instance.task_state)
@mock.patch('nova.compute.utils.notify_about_instance_usage')
@mock.patch('nova.compute.rpcapi.ComputeAPI.build_and_run_instance')

2
nova/tests/unit/virt/libvirt/test_migration.py
View File

@ -44,7 +44,7 @@ class UtilityMigrationTestCase(test.NoDBTestCase):
def test_graphics_listen_addrs_empty(self):
data = objects.LibvirtLiveMigrateData()
addrs = migration.graphics_listen_addrs(data)
self.assertIsNone(None, addrs)
self.assertIsNone(addrs)
def test_graphics_listen_addrs_spice(self):
data = objects.LibvirtLiveMigrateData(