From ca2c7a89849a6223ac9c4dd79ccdb6da86e0a7d2 Mon Sep 17 00:00:00 2001 From: Takashi NATSUME Date: Mon, 22 Feb 2016 15:50:29 +0900 Subject: [PATCH] Fix misuse of assertTrue in console and virt tests AssertEqual should be used instead of assertTrue in the unit tests. Change-Id: I7d196443e771090c7d9dd2c19bab237146e20e10 Closes-Bug: #1548198 --- nova/tests/unit/console/test_serial.py | 2 +- nova/tests/unit/virt/disk/vfs/test_guestfs.py | 2 +- nova/tests/unit/virt/fakelibosinfo.py | 2 +- nova/tests/unit/virt/test_osinfo.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nova/tests/unit/console/test_serial.py b/nova/tests/unit/console/test_serial.py index 7916218a8f12..d910f0256379 100644 --- a/nova/tests/unit/console/test_serial.py +++ b/nova/tests/unit/console/test_serial.py @@ -92,7 +92,7 @@ class SerialTestCase(test.NoDBTestCase): for port in six.moves.range(start, stop): self.assertEqual(port, serial.acquire_port('127.0.0.2')) - self.assertTrue(10, len(serial.ALLOCATED_PORTS)) + self.assertEqual(10, len(serial.ALLOCATED_PORTS)) @mock.patch('nova.console.serial._verify_port') def test_acquire_port_in_use(self, fake_verify_port): diff --git a/nova/tests/unit/virt/disk/vfs/test_guestfs.py b/nova/tests/unit/virt/disk/vfs/test_guestfs.py index 2d39bc885672..938a90160e87 100644 --- a/nova/tests/unit/virt/disk/vfs/test_guestfs.py +++ b/nova/tests/unit/virt/disk/vfs/test_guestfs.py @@ -296,7 +296,7 @@ class VirtDiskVFSGuestFSTest(test.NoDBTestCase): vfs = vfsimpl.VFSGuestFS(self.rawfile) vfs.setup() self.assertIsNotNone(vfs.handle) - self.assertTrue('ext3', vfs.get_image_fs()) + self.assertEqual('ext3', vfs.get_image_fs()) vfs.teardown() @mock.patch.object(vfsimpl.VFSGuestFS, 'setup_os') diff --git a/nova/tests/unit/virt/fakelibosinfo.py b/nova/tests/unit/virt/fakelibosinfo.py index 470d5c52b2e0..dbe493b654f1 100644 --- a/nova/tests/unit/virt/fakelibosinfo.py +++ b/nova/tests/unit/virt/fakelibosinfo.py @@ -107,7 +107,7 @@ class Os(object): return new_list def get_name(self): - self.name + return self.name class DeviceList(object): diff --git a/nova/tests/unit/virt/test_osinfo.py b/nova/tests/unit/virt/test_osinfo.py index fcc8e68bb9f4..14842d4e182b 100644 --- a/nova/tests/unit/virt/test_osinfo.py +++ b/nova/tests/unit/virt/test_osinfo.py @@ -42,7 +42,7 @@ class LibvirtOsInfoTest(test.NoDBTestCase): def test_get_os(self): os_info_db = osinfo._OsInfoDatabase.get_instance() os_name = os_info_db.get_os('fedora22').get_name() - self.assertTrue('Fedora 22', os_name) + self.assertEqual('Fedora 22', os_name) def test_get_os_fails(self): os_info_db = osinfo._OsInfoDatabase.get_instance()