diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-26 09:16:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-26 09:16:09 +0000 |
| commit | 0fb3329a18fa030b503da839c6e9e4d56ad29ab5 (patch) | |
| tree | 33afccd9b7d2be2f90dad8f33bfc61ca860e6b6d /ironic_python_agent/tests/unit | |
| parent | ad44a7922b7d6bbd61c343f9d561672361dcc2b3 (diff) | |
| parent | db5272cfea9fa894675690d54b7d042cb3d01df3 (diff) | |
| download | ironic-python-agent-0fb3329a18fa030b503da839c6e9e4d56ad29ab5.tar.gz | |
Merge "Remove hard-coded path to grub binaries"
Diffstat (limited to 'ironic_python_agent/tests/unit')
| -rw-r--r-- | ironic_python_agent/tests/unit/extensions/test_image.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/ironic_python_agent/tests/unit/extensions/test_image.py b/ironic_python_agent/tests/unit/extensions/test_image.py index 30383ecc..047e97b1 100644 --- a/ironic_python_agent/tests/unit/extensions/test_image.py +++ b/ironic_python_agent/tests/unit/extensions/test_image.py @@ -87,14 +87,14 @@ class TestImageExtension(test_base.BaseTestCase): mock.call('mount', '-t', 'sysfs', 'none', self.fake_dir + '/sys'), mock.call(('chroot %s /bin/sh -c ' - '"/usr/sbin/grub-install %s"' % + '"grub-install %s"' % (self.fake_dir, self.fake_dev)), shell=True, - env_variables={'PATH': '/sbin:/bin'}), + env_variables={'PATH': '/sbin:/bin:/usr/sbin'}), mock.call(('chroot %s /bin/sh -c ' - '"/usr/sbin/grub-mkconfig -o ' + '"grub-mkconfig -o ' '/boot/grub/grub.cfg"' % self.fake_dir), shell=True, - env_variables={'PATH': '/sbin:/bin'}), + env_variables={'PATH': '/sbin:/bin:/usr/sbin'}), mock.call('umount', self.fake_dir + '/dev', attempts=3, delay_on_retry=True), mock.call('umount', self.fake_dir + '/proc', @@ -132,18 +132,18 @@ class TestImageExtension(test_base.BaseTestCase): mock.call('mount', self.fake_efi_system_part, self.fake_dir + '/boot/efi'), mock.call(('chroot %s /bin/sh -c ' - '"/usr/sbin/grub-install %s"' % + '"grub-install %s"' % (self.fake_dir, self.fake_dev)), shell=True, - env_variables={'PATH': '/sbin:/bin'}), + env_variables={'PATH': '/sbin:/bin:/usr/sbin'}), mock.call(('chroot %s /bin/sh -c ' - '"/usr/sbin/grub-install %s --removable"' % + '"grub-install %s --removable"' % (self.fake_dir, self.fake_dev)), shell=True, - env_variables={'PATH': '/sbin:/bin'}), + env_variables={'PATH': '/sbin:/bin:/usr/sbin'}), mock.call(('chroot %s /bin/sh -c ' - '"/usr/sbin/grub-mkconfig -o ' + '"grub-mkconfig -o ' '/boot/grub/grub.cfg"' % self.fake_dir), shell=True, - env_variables={'PATH': '/sbin:/bin'}), + env_variables={'PATH': '/sbin:/bin:/usr/sbin'}), mock.call('umount', self.fake_dir + '/boot/efi', attempts=3, delay_on_retry=True), mock.call('umount', self.fake_dir + '/dev', @@ -192,18 +192,18 @@ class TestImageExtension(test_base.BaseTestCase): mock.call('mount', self.fake_efi_system_part, self.fake_dir + '/boot/efi'), mock.call(('chroot %s /bin/sh -c ' - '"/usr/sbin/grub-install %s"' % + '"grub-install %s"' % (self.fake_dir, self.fake_dev)), shell=True, - env_variables={'PATH': '/sbin:/bin'}), + env_variables={'PATH': '/sbin:/bin:/usr/sbin'}), mock.call(('chroot %s /bin/sh -c ' - '"/usr/sbin/grub-install %s --removable"' % + '"grub-install %s --removable"' % (self.fake_dir, self.fake_dev)), shell=True, - env_variables={'PATH': '/sbin:/bin'}), + env_variables={'PATH': '/sbin:/bin:/usr/sbin'}), mock.call(('chroot %s /bin/sh -c ' - '"/usr/sbin/grub-mkconfig -o ' + '"grub-mkconfig -o ' '/boot/grub/grub.cfg"' % self.fake_dir), shell=True, - env_variables={'PATH': '/sbin:/bin'}), + env_variables={'PATH': '/sbin:/bin:/usr/sbin'}), mock.call('umount', self.fake_dir + '/boot/efi', attempts=3, delay_on_retry=True)] mock_execute.assert_has_calls(expected) |