From 82dde55e640203ecf7dc5fd9fb733ae1dd67b6b7 Mon Sep 17 00:00:00 2001 From: sophia Date: Tue, 6 Apr 2021 11:00:41 -0500 Subject: [PATCH] Get folder mount name --- plugins/guests/linux/cap/mount_smb_shared_folder.rb | 2 +- .../plugins/guests/linux/cap/mount_smb_shared_folder_test.rb | 2 +- .../guests/linux/cap/persist_mount_shared_folder_test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/guests/linux/cap/mount_smb_shared_folder.rb b/plugins/guests/linux/cap/mount_smb_shared_folder.rb index a011e551f..bf0fe457d 100644 --- a/plugins/guests/linux/cap/mount_smb_shared_folder.rb +++ b/plugins/guests/linux/cap/mount_smb_shared_folder.rb @@ -20,7 +20,7 @@ module VagrantPlugins :shell_expand_guest_path, guestpath) options[:smb_id] ||= name - mount_device = options[:plugin].capability(:mount_name, options) + mount_device = options[:plugin].capability(:mount_name, name, options) mount_options, _, _ = options[:plugin].capability( :mount_options, name, expanded_guest_path, options) mount_type = options[:plugin].capability(:mount_type) diff --git a/test/unit/plugins/guests/linux/cap/mount_smb_shared_folder_test.rb b/test/unit/plugins/guests/linux/cap/mount_smb_shared_folder_test.rb index 3414a1b69..ab3ef9136 100644 --- a/test/unit/plugins/guests/linux/cap/mount_smb_shared_folder_test.rb +++ b/test/unit/plugins/guests/linux/cap/mount_smb_shared_folder_test.rb @@ -43,7 +43,7 @@ describe "VagrantPlugins::GuestLinux::Cap::MountSMBSharedFolder" do allow(folder_plugin).to receive(:capability).with(:mount_options, mount_name, mount_guest_path, folder_options). and_return(["uid=#{mount_uid},gid=#{mount_gid},sec=ntlmssp,credentials=/etc/smb_creds_id", mount_uid, mount_gid]) allow(folder_plugin).to receive(:capability).with(:mount_type).and_return("cifs") - allow(folder_plugin).to receive(:capability).with(:mount_name, any_args).and_return("//localhost/#{mount_name}") + allow(folder_plugin).to receive(:capability).with(:mount_name, mount_name, folder_options).and_return("//localhost/#{mount_name}") end after do diff --git a/test/unit/plugins/guests/linux/cap/persist_mount_shared_folder_test.rb b/test/unit/plugins/guests/linux/cap/persist_mount_shared_folder_test.rb index 62ed79be2..b88a1e971 100644 --- a/test/unit/plugins/guests/linux/cap/persist_mount_shared_folder_test.rb +++ b/test/unit/plugins/guests/linux/cap/persist_mount_shared_folder_test.rb @@ -121,7 +121,7 @@ describe "VagrantPlugins::GuestLinux::Cap::PersistMountSharedFolder" do before do allow(folder_plugin).to receive(:capability).with(:mount_type).and_return("cifs") allow(folder_plugin).to receive(:capability?).with(:mount_name).and_return(true) - allow(folder_plugin).to receive(:capability).with(:mount_name, any_args).and_return("//192.168.42.42/dummyname") + allow(folder_plugin).to receive(:capability).with(:mount_name, instance_of(String), any_args).and_return("//192.168.42.42/dummyname") end it "inserts folders into /etc/fstab" do