From 625bbf9cc84fc997ab8cefcf346542f1f462fb68 Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Wed, 12 Feb 2020 16:26:18 -0800 Subject: [PATCH] Add more specific rescue exceptions for when errors occur for resizing disks --- plugins/providers/virtualbox/cap/configure_disks.rb | 2 +- .../plugins/providers/virtualbox/cap/configure_disks_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/providers/virtualbox/cap/configure_disks.rb b/plugins/providers/virtualbox/cap/configure_disks.rb index 19df52b04..8dcfc961f 100644 --- a/plugins/providers/virtualbox/cap/configure_disks.rb +++ b/plugins/providers/virtualbox/cap/configure_disks.rb @@ -219,7 +219,7 @@ module VagrantPlugins # clone back to original vmdk format and attach resized disk vmdk_disk_file = machine.provider.driver.vdi_to_vmdk(vdi_disk_file) machine.provider.driver.attach_disk(disk_info[:port], disk_info[:device], vmdk_disk_file, "hdd") - rescue Exception + rescue ScriptError, SignalException, StandardError LOGGER.warn("Vagrant encountered an error while trying to resize a disk. Vagrant will now attempt to reattach and preserve the original disk...") machine.ui.error(I18n.t("vagrant.cap.configure_disks.recovery_from_resize", diff --git a/test/unit/plugins/providers/virtualbox/cap/configure_disks_test.rb b/test/unit/plugins/providers/virtualbox/cap/configure_disks_test.rb index 8743ff180..05ac77e68 100644 --- a/test/unit/plugins/providers/virtualbox/cap/configure_disks_test.rb +++ b/test/unit/plugins/providers/virtualbox/cap/configure_disks_test.rb @@ -328,7 +328,7 @@ describe VagrantPlugins::ProviderVirtualBox::Cap::ConfigureDisks do and_return(true) expect(driver).to receive(:close_medium).with("12345") - allow(driver).to receive(:vdi_to_vmdk).and_raise(Exception) + allow(driver).to receive(:vdi_to_vmdk).and_raise(StandardError) expect(FileUtils).to receive(:mv).with("#{vmdk_disk_file}.backup", vmdk_disk_file, force: true). and_return(true)