diff options
Diffstat (limited to 'ironic_python_agent/tests/unit/extensions/test_image.py')
| -rw-r--r-- | ironic_python_agent/tests/unit/extensions/test_image.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ironic_python_agent/tests/unit/extensions/test_image.py b/ironic_python_agent/tests/unit/extensions/test_image.py index 4f06e465..9661e6f3 100644 --- a/ironic_python_agent/tests/unit/extensions/test_image.py +++ b/ironic_python_agent/tests/unit/extensions/test_image.py @@ -576,7 +576,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n uuid=self.fake_prep_boot_part_uuid) self.assertFalse(mock_dispatch.called) - @mock.patch.object(os.path, 'ismount', lambda *_: True) + @mock.patch.object(os.path, 'ismount', lambda *_: False) @mock.patch.object(os.path, 'exists', lambda *_: False) @mock.patch.object(image, '_is_bootloader_loaded', lambda *_: True) @mock.patch.object(image, '_append_uefi_to_fstab', autospec=True) @@ -609,6 +609,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n self.fake_dir + '/run'), mock.call('mount', '-t', 'sysfs', 'none', self.fake_dir + '/sys'), + mock.call('mount', '/dev/fake2', self.fake_dir), mock.call(('chroot %s /bin/sh -c "mount -a -t vfat"' % (self.fake_dir)), shell=True, env_variables={ @@ -664,7 +665,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n mock_append_to_fstab.assert_called_with(self.fake_dir, self.fake_efi_system_part_uuid) - @mock.patch.object(os.path, 'ismount', lambda *_: True) + @mock.patch.object(os.path, 'ismount', lambda *_: False) @mock.patch.object(image, '_is_bootloader_loaded', lambda *_: True) @mock.patch.object(os.path, 'exists', autospec=True) @mock.patch.object(hardware, 'is_md_device', autospec=True) @@ -706,6 +707,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n self.fake_dir + '/run'), mock.call('mount', '-t', 'sysfs', 'none', self.fake_dir + '/sys'), + mock.call('mount', '/dev/fake2', self.fake_dir), mock.call(('chroot %s /bin/sh -c "mount -a -t vfat"' % (self.fake_dir)), shell=True, env_variables={ @@ -760,7 +762,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n self.assertFalse(mock_dispatch.called) @mock.patch.object(image, '_efi_boot_setup', lambda *_: False) - @mock.patch.object(os.path, 'ismount', lambda *_: True) + @mock.patch.object(os.path, 'ismount', lambda *_: False) @mock.patch.object(image, '_is_bootloader_loaded', lambda *_: True) @mock.patch.object(os.path, 'exists', autospec=True) @mock.patch.object(hardware, 'is_md_device', autospec=True) @@ -815,6 +817,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n 'GRUB_SAVEDEFAULT': 'true'}, use_standard_locale=True), mock.call('umount', self.fake_dir + '/boot/efi'), + mock.call('mount', '/dev/fake2', self.fake_dir), # NOTE(TheJulia): chroot mount is for whole disk images mock.call(('chroot %s /bin/sh -c "mount -a -t vfat"' % (self.fake_dir)), shell=True, @@ -1037,7 +1040,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n uuid=self.fake_efi_system_part_uuid) self.assertFalse(mock_dispatch.called) - @mock.patch.object(os.path, 'ismount', lambda *_: True) + @mock.patch.object(os.path, 'ismount', lambda *_: False) @mock.patch.object(image, '_is_bootloader_loaded', lambda *_: False) @mock.patch.object(image, '_append_uefi_to_fstab', autospec=True) @mock.patch.object(image, '_preserve_efi_assets', autospec=True) @@ -1089,6 +1092,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n 'GRUB_DISABLE_OS_PROBER': 'true', 'GRUB_SAVEDEFAULT': 'true'}, use_standard_locale=True), + mock.call('mount', '/dev/fake2', self.fake_dir), mock.call(('chroot %s /bin/sh -c "mount -a -t vfat"' % (self.fake_dir)), shell=True, env_variables={ @@ -1239,7 +1243,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n self.assertFalse(mock_dispatch.called) self.assertEqual(2, mock_oslistdir.call_count) - @mock.patch.object(os.path, 'ismount', lambda *_: True) + @mock.patch.object(os.path, 'ismount', lambda *_: False) @mock.patch.object(image, '_is_bootloader_loaded', lambda *_: False) @mock.patch.object(os, 'listdir', autospec=True) @mock.patch.object(image, '_append_uefi_to_fstab', autospec=True) @@ -1284,7 +1288,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n mock.call('mount', '-t', 'vfat', '/dev/fake1', self.fake_dir + '/boot/efi'), mock.call('umount', self.fake_dir + '/boot/efi'), - + mock.call('mount', '/dev/fake2', self.fake_dir), mock.call(('chroot %s /bin/sh -c "mount -a -t vfat"' % (self.fake_dir)), shell=True, env_variables={ |