openstack
/
nova
Code Issues Proposed changes

Fix misuse of assertIsNone 

Change-Id: If86f954a37c6c9e5d637db9f7d8d80e40d3b0fc9
Closes-Bug: #1699927
This commit is contained in:
Takashi NATSUME 2017-06-23 09:39:56 +09:00
parent 6386692b4b
commit a50d21662e
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

@ -71,8 +71,8 @@ class ServersPreSchedulingTestCase(test.TestCase):
self.assertEqual(flavor_get_resp.body['flavor']['name'],
server['flavor']['original_name'])
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'])
@ -101,8 +101,8 @@ class ServersPreSchedulingTestCase(test.TestCase):
self.assertEqual(flavor_get_resp.body['flavor']['name'],
server['flavor']['original_name'])
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

@ -1481,7 +1481,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(