From a50d21662e121c50457f3154200845450e2af301 Mon Sep 17 00:00:00 2001 From: Takashi NATSUME Date: Fri, 23 Jun 2017 09:39:56 +0900 Subject: [PATCH] Fix misuse of assertIsNone Change-Id: If86f954a37c6c9e5d637db9f7d8d80e40d3b0fc9 Closes-Bug: #1699927 --- nova/tests/functional/wsgi/test_servers.py | 8 ++++---- nova/tests/unit/conductor/test_conductor.py | 2 +- nova/tests/unit/virt/libvirt/test_migration.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nova/tests/functional/wsgi/test_servers.py b/nova/tests/functional/wsgi/test_servers.py index 93a8c10632a3..43dde6fdf7dd 100644 --- a/nova/tests/functional/wsgi/test_servers.py +++ b/nova/tests/functional/wsgi/test_servers.py @@ -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']) diff --git a/nova/tests/unit/conductor/test_conductor.py b/nova/tests/unit/conductor/test_conductor.py index 37fc5c2934f5..b509743b1caf 100644 --- a/nova/tests/unit/conductor/test_conductor.py +++ b/nova/tests/unit/conductor/test_conductor.py @@ -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') diff --git a/nova/tests/unit/virt/libvirt/test_migration.py b/nova/tests/unit/virt/libvirt/test_migration.py index 028d4f64506b..ddb7d23ca15a 100644 --- a/nova/tests/unit/virt/libvirt/test_migration.py +++ b/nova/tests/unit/virt/libvirt/test_migration.py @@ -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(