diff options
| author | Zuul <zuul@review.opendev.org> | 2021-05-27 13:09:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-05-27 13:09:48 +0000 |
| commit | 5c063c8224d3d3e69a1e10f2252e2eebdcceffb1 (patch) | |
| tree | 03efa886f21536978ec14adbccfefd959323e4e8 /ironic_python_agent/tests | |
| parent | 9e4c7052a2fd9aac03858db696bf1ea9487f15e6 (diff) | |
| parent | 10d18c41136cc645ee99d41acfb6031b9158e1fb (diff) | |
| download | ironic-python-agent-5c063c8224d3d3e69a1e10f2252e2eebdcceffb1.tar.gz | |
Merge "Make _get_efi_bootloaders return relative paths"
Diffstat (limited to 'ironic_python_agent/tests')
| -rw-r--r-- | ironic_python_agent/tests/unit/extensions/test_image.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ironic_python_agent/tests/unit/extensions/test_image.py b/ironic_python_agent/tests/unit/extensions/test_image.py index d8471d2b..e2b633a7 100644 --- a/ironic_python_agent/tests/unit/extensions/test_image.py +++ b/ironic_python_agent/tests/unit/extensions/test_image.py @@ -222,7 +222,7 @@ class TestImageExtension(base.IronicAgentTest): self.fake_dev, hardware.BootInfo(current_boot_mode='uefi') ] mock_partition.side_effect = [self.fake_dev, self.fake_efi_system_part] - mock_efi_bl.return_value = ['\\EFI\\BOOT\\BOOTX64.EFI'] + mock_efi_bl.return_value = ['EFI/BOOT/BOOTX64.EFI'] mock_utils_efi_part.return_value = '1' mock_execute.side_effect = iter([('', ''), ('', ''), @@ -271,7 +271,7 @@ class TestImageExtension(base.IronicAgentTest): ] mock_partition.return_value = self.fake_dev mock_utils_efi_part.return_value = '1' - mock_efi_bl.return_value = ['\\EFI\\BOOT\\BOOTX64.EFI'] + mock_efi_bl.return_value = ['EFI/BOOT/BOOTX64.EFI'] mock_execute.side_effect = iter([('', ''), ('', ''), ('', ''), ('', ''), ('', ''), ('', ''), @@ -318,7 +318,7 @@ class TestImageExtension(base.IronicAgentTest): ] mock_partition.return_value = self.fake_dev mock_utils_efi_part.return_value = '1' - mock_efi_bl.return_value = ['\\EFI\\BOOT\\BOOTX64.EFI'] + mock_efi_bl.return_value = ['EFI/BOOT/BOOTX64.EFI'] stdeer_msg = """ efibootmgr: ** Warning ** : Boot0004 has same label ironic1\n efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n @@ -372,8 +372,8 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n ] mock_partition.return_value = self.fake_dev mock_utils_efi_part.return_value = '1' - mock_efi_bl.return_value = ['\\EFI\\BOOT\\BOOTX64.EFI', - '\\WINDOWS\\system32\\winload.efi'] + mock_efi_bl.return_value = ['EFI/BOOT/BOOTX64.EFI', + 'WINDOWS/system32/winload.efi'] mock_execute.side_effect = iter([('', ''), ('', ''), ('', ''), ('', ''), @@ -2071,7 +2071,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n mock_utils_efi_part.return_value = '1' mock_get_part_uuid.return_value = self.fake_dev - mock_efi_bl.return_value = ['\\EFI\\BOOT\\BOOTX64.EFI'] + mock_efi_bl.return_value = ['EFI/BOOT/BOOTX64.EFI'] mock_execute.side_effect = iter([('', ''), ('', ''), ('', ''), ('', ''), @@ -2110,7 +2110,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n mock_utils_efi_part.return_value = '1' mock_get_part_uuid.return_value = '/dev/fakenvme0p1' - mock_efi_bl.return_value = ['\\EFI\\BOOT\\BOOTX64.EFI'] + mock_efi_bl.return_value = ['EFI/BOOT/BOOTX64.EFI'] mock_execute.side_effect = iter([('', ''), ('', ''), ('', ''), ('', ''), @@ -2150,7 +2150,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n mock_utils_efi_part.return_value = '1' mock_get_part_uuid.side_effect = Exception - mock_efi_bl.return_value = ['\\EFI\\BOOT\\BOOTX64.EFI'] + mock_efi_bl.return_value = ['EFI/BOOT/BOOTX64.EFI'] mock_execute.side_effect = iter([('', ''), ('', ''), ('', ''), ('', ''), @@ -2219,7 +2219,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n ] mock_access.return_value = True result = image._get_efi_bootloaders("/boot/efi") - self.assertEqual(result[0], '\\EFI\\BOOT\\BOOTX64.EFI') + self.assertEqual(result[0], 'EFI/BOOT/BOOTX64.EFI') @mock.patch.object(os, 'walk', autospec=True) @mock.patch.object(os, 'access', autospec=True) @@ -2233,7 +2233,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n ] mock_access.return_value = True result = image._get_efi_bootloaders("/boot/efi") - self.assertEqual(result[0], '\\WINDOWS\\system32\\winload.efi') + self.assertEqual(result[0], 'WINDOWS/system32/winload.efi') def test__run_efibootmgr_no_bootloaders(self, mock_execute, mock_dispatch): result = image._run_efibootmgr([], self.fake_dev, @@ -2243,7 +2243,7 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n mock_execute.assert_has_calls(expected) def test__run_efibootmgr(self, mock_execute, mock_dispatch): - result = image._run_efibootmgr(['\\EFI\\BOOT\\BOOTX64.EFI'], + result = image._run_efibootmgr(['EFI/BOOT/BOOTX64.EFI'], self.fake_dev, self.fake_efi_system_part) expected = [mock.call('efibootmgr'), |