x/bareon
Code Issues Proposed changes

Using assertIsNone() instead of assertEqual(None)

Browse Source 
Following OpenStack Style Guidelines[1]: http://docs.openstack.org/developer/hacking/#unit-tests-and-assertraises
[H203] Unit test assertions tend to give better messages for more
specific assertions. As a result, assertIsNone(...) is preferred
over assertEqual(None, ...) and assertIs(..,None)

Change-Id: Ic11aa63546ca1da7cae4467bb0edfd93d40ba81b
This commit is contained in:
Nam Nguyen Hoai 2016-09-28 09:08:54 +07:00
parent 26b47c2e8f
commit 1c422b6a6a
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bareon/tests/test_generic_deploy_driver.py
View File

@ -36,7 +36,7 @@ class TestDoReboot(unittest2.TestCase):
@mock.patch('bareon.utils.utils.execute') @mock.patch('bareon.utils.utils.execute')
def test_do_reboot(self, mock_execute): def test_do_reboot(self, mock_execute):
result = self.driver.do_reboot() result = self.driver.do_reboot()
self.assertEqual(result, None) self.assertIsNone(result)
mock_execute.assert_called_once_with('reboot') mock_execute.assert_called_once_with('reboot')
@ -53,7 +53,7 @@ class TestDoProvision(unittest2.TestCase):
self.driver.do_bootloader = mock_bootloader = mock.MagicMock() self.driver.do_bootloader = mock_bootloader = mock.MagicMock()
result = self.driver.do_provisioning() result = self.driver.do_provisioning()
self.assertEqual(result, None) self.assertIsNone(result)
mock_partitioning.assert_called_once_with() mock_partitioning.assert_called_once_with()
mock_configdrive.assert_called_once_with() mock_configdrive.assert_called_once_with()
@ -70,7 +70,7 @@ class TestDoConfigDrive(unittest2.TestCase):
def test_do_configdrive(self): def test_do_configdrive(self):
result = self.driver.do_configdrive() result = self.driver.do_configdrive()
self.assertEqual(result, None) self.assertIsNone(result)
self.mock_data_driver.create_configdrive.assert_called_once_with() self.mock_data_driver.create_configdrive.assert_called_once_with()
@ -91,7 +91,7 @@ class TestMountTarget(unittest2.TestCase):
result = self.driver._mount_target(chroot, os_id, True, result = self.driver._mount_target(chroot, os_id, True,
False) False)
self.assertEqual(result, None) self.assertIsNone(result)
mock_makedirs.assert_has_calls([mock.call(chroot + path) mock_makedirs.assert_has_calls([mock.call(chroot + path)
for path in pseudo_fs], any_order=True) for path in pseudo_fs], any_order=True)
mock_mount_bind.assert_has_calls([mock.call(chroot, path) mock_mount_bind.assert_has_calls([mock.call(chroot, path)
@ -114,7 +114,7 @@ class TestMountTarget(unittest2.TestCase):
result = self.driver._mount_target(chroot, os_id, False, result = self.driver._mount_target(chroot, os_id, False,
True) True)
self.assertEqual(result, None) self.assertIsNone(result)
mock_execute.assert_called_once_with('chroot', chroot, 'grep', '-v', mock_execute.assert_called_once_with('chroot', chroot, 'grep', '-v',
'rootfs', '/proc/mounts') 'rootfs', '/proc/mounts')
mock_islink.assert_called_once_with(chroot + '/etc/mtab') mock_islink.assert_called_once_with(chroot + '/etc/mtab')
@ -137,7 +137,7 @@ class TestMountTarget(unittest2.TestCase):
result = self.driver._mount_target(chroot, os_id, False, result = self.driver._mount_target(chroot, os_id, False,
True) True)
self.assertEqual(result, None) self.assertIsNone(result)
mock_execute.assert_called_once_with('chroot', chroot, 'grep', '-v', mock_execute.assert_called_once_with('chroot', chroot, 'grep', '-v',
'rootfs', '/proc/mounts') 'rootfs', '/proc/mounts')
mock_islink.assert_called_once_with(chroot + '/etc/mtab') mock_islink.assert_called_once_with(chroot + '/etc/mtab')
@ -159,7 +159,7 @@ class TestMountTarget(unittest2.TestCase):
result = self.driver._mount_target(chroot, os_id, False, result = self.driver._mount_target(chroot, os_id, False,
False) False)
self.assertEqual(result, None) self.assertIsNone(result)
mock_makedirs.assert_has_calls( mock_makedirs.assert_has_calls(
[mock.call(os.path.join(chroot, f.mount.strip(os.sep))) for f [mock.call(os.path.join(chroot, f.mount.strip(os.sep))) for f
in fss[1:]], any_order=True) in fss[1:]], any_order=True)
@ -182,7 +182,7 @@ class TestMountTarget(unittest2.TestCase):
result = self.driver._mount_target(chroot, os_id, False, result = self.driver._mount_target(chroot, os_id, False,
False) False)
self.assertEqual(result, None) self.assertIsNone(result)
mock_makedirs.assert_has_calls( mock_makedirs.assert_has_calls(
[mock.call(os.path.join(chroot, f.mount.strip(os.sep))) for f [mock.call(os.path.join(chroot, f.mount.strip(os.sep))) for f
in fss], any_order=True) in fss], any_order=True)
@ -208,7 +208,7 @@ class TestUmountTarget(unittest2.TestCase):
result = self.driver._umount_target(chroot, True) result = self.driver._umount_target(chroot, True)
self.assertEqual(result, None) self.assertIsNone(result)
mock_umount_fs.assert_has_calls( mock_umount_fs.assert_has_calls(
[mock.call(chroot + path, try_lazy_umount=True) for path in [mock.call(chroot + path, try_lazy_umount=True) for path in
pseudo_fs], any_order=True) pseudo_fs], any_order=True)
@ -223,7 +223,7 @@ class TestUmountTarget(unittest2.TestCase):
self.fs_sorted.return_value = fss self.fs_sorted.return_value = fss
result = self.driver._umount_target(chroot, os_id, False) result = self.driver._umount_target(chroot, os_id, False)
self.assertEqual(result, None) self.assertIsNone(result)
mock_umount.assert_has_calls( mock_umount.assert_has_calls(
[mock.call(os.path.join(chroot, f.mount.strip(os.sep))) for f [mock.call(os.path.join(chroot, f.mount.strip(os.sep))) for f
in fss], any_order=True) in fss], any_order=True)
@ -241,7 +241,7 @@ class TestUmountTarget(unittest2.TestCase):
result = self.driver._umount_target(chroot, os_id, False) result = self.driver._umount_target(chroot, os_id, False)
self.assertEqual(result, None) self.assertIsNone(result)
mock_umount.assert_has_calls( mock_umount.assert_has_calls(
[mock.call(os.path.join(chroot, f.mount.strip(os.sep))) for f [mock.call(os.path.join(chroot, f.mount.strip(os.sep))) for f
in fss[1:]], any_order=True) in fss[1:]], any_order=True)
@ -283,7 +283,7 @@ class TestDoBootloader(unittest2.TestCase):
result = self.driver.do_singleboot_bootloader(chroot, os_id) result = self.driver.do_singleboot_bootloader(chroot, os_id)
self.assertEqual(result, None) self.assertIsNone(result)
mock_grub2_cfg.assert_called_once_with( mock_grub2_cfg.assert_called_once_with(
kernel_params=kernel_params, kernel_params=kernel_params,
chroot=chroot, chroot=chroot,
@ -318,7 +318,7 @@ class TestDoBootloader(unittest2.TestCase):
result = self.driver.do_singleboot_bootloader(chroot, os_id) result = self.driver.do_singleboot_bootloader(chroot, os_id)
self.assertEqual(result, None) self.assertIsNone(result)
mock_grub1_cfg.assert_called_once_with(kernel=kernel_name, mock_grub1_cfg.assert_called_once_with(kernel=kernel_name,
initrd=initrd_name, initrd=initrd_name,
kernel_params=kernel_params, kernel_params=kernel_params,
@ -351,7 +351,7 @@ class TestDoBootloader(unittest2.TestCase):
result = self.driver.do_singleboot_bootloader(chroot, os_id) result = self.driver.do_singleboot_bootloader(chroot, os_id)
self.assertEqual(result, None) self.assertIsNone(result)
mock_grub2_cfg.assert_called_once_with(kernel_params=kernel_params, mock_grub2_cfg.assert_called_once_with(kernel_params=kernel_params,
chroot=chroot, chroot=chroot,
grub_timeout=CONF.grub_timeout, grub_timeout=CONF.grub_timeout,
@ -383,7 +383,7 @@ class TestDoBootloader(unittest2.TestCase):
result = self.driver.do_singleboot_bootloader(chroot, os_id) result = self.driver.do_singleboot_bootloader(chroot, os_id)
self.assertEqual(result, None) self.assertIsNone(result)
mock_grub1_cfg.assert_called_once_with(kernel=kernel_name, mock_grub1_cfg.assert_called_once_with(kernel=kernel_name,
initrd=initrd_name, initrd=initrd_name,
kernel_params=kernel_params, kernel_params=kernel_params,
@ -423,7 +423,7 @@ class TestDoBootloader(unittest2.TestCase):
result = self.driver.do_singleboot_bootloader(chroot, os_id) result = self.driver.do_singleboot_bootloader(chroot, os_id)
self.assertEqual(result, None) self.assertIsNone(result)
mock_grub1_cfg.assert_called_once_with(kernel=kernel_name, mock_grub1_cfg.assert_called_once_with(kernel=kernel_name,
initrd=initrd_name, initrd=initrd_name,
kernel_params=kernel_params, kernel_params=kernel_params,
@ -465,7 +465,7 @@ class TestGenerateFstab(unittest2.TestCase):
result = self.driver.do_generate_fstab(chroot, 'test') result = self.driver.do_generate_fstab(chroot, 'test')
self.assertEqual(result, None) self.assertIsNone(result)
file_mock.assert_has_calls( file_mock.assert_has_calls(
[mock.call.write('UUID=0 swap swap defaults 0 0\n'), [mock.call.write('UUID=0 swap swap defaults 0 0\n'),
@ -494,7 +494,7 @@ class TestGenerateFstab(unittest2.TestCase):
result = self.driver.do_generate_fstab(chroot, 'test') result = self.driver.do_generate_fstab(chroot, 'test')
self.assertEqual(result, None) self.assertIsNone(result)
file_mock.assert_has_calls( file_mock.assert_has_calls(
[mock.call.write('UUID=0 swap swap defaults 0 0\n'), [mock.call.write('UUID=0 swap swap defaults 0 0\n'),
@ -524,7 +524,7 @@ class TestGenerateFstab(unittest2.TestCase):
result = self.driver.do_generate_fstab(chroot, 'test') result = self.driver.do_generate_fstab(chroot, 'test')
self.assertEqual(result, None) self.assertIsNone(result)
file_mock.assert_has_calls( file_mock.assert_has_calls(
[mock.call.write('UUID=0 swap swap defaults 0 0\n'), [mock.call.write('UUID=0 swap swap defaults 0 0\n'),

2
bareon/tests/test_partition.py
View File

@ -251,7 +251,7 @@ class TestParted(unittest2.TestCase):
def test_next_name_none(self, nt_mock, nc_mock): def test_next_name_none(self, nt_mock, nc_mock):
nc_mock.return_value = 1 nc_mock.return_value = 1
nt_mock.return_value = 'extended' nt_mock.return_value = 'extended'
self.assertEqual(None, self.prtd.next_name()) self.assertIsNone(self.prtd.next_name())
@mock.patch.object(objects.Parted, 'next_count') @mock.patch.object(objects.Parted, 'next_count')
@mock.patch.object(objects.Parted, 'next_type') @mock.patch.object(objects.Parted, 'next_type')

2
bareon/tests/test_rsync_deploy_driver.py
View File

@ -41,7 +41,7 @@ class TestDoCopyimage(unittest2.TestCase):
result = self.driver.do_copyimage(os_id) result = self.driver.do_copyimage(os_id)
self.assertEqual(result, None) self.assertIsNone(result)
self.mock_mount(chroot, pseudo=False, treat_mtab=False) self.mock_mount(chroot, pseudo=False, treat_mtab=False)
self.mock_umount(chroot, pseudo=False) self.mock_umount(chroot, pseudo=False)
mock_execute.assert_called_once_with('rsync', 'r_flags', mock_execute.assert_called_once_with('rsync', 'r_flags',