From 7517faa9ee8221dd0ef5c1c07a1074fe9b0046d1 Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Mon, 7 Jan 2019 09:01:51 -0600 Subject: [PATCH] Remove tmpdir after rsync completes --- plugins/synced_folders/rsync/helper.rb | 3 +++ test/unit/plugins/synced_folders/rsync/helper_test.rb | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/plugins/synced_folders/rsync/helper.rb b/plugins/synced_folders/rsync/helper.rb index 8eba835ee..b93f85a2a 100644 --- a/plugins/synced_folders/rsync/helper.rb +++ b/plugins/synced_folders/rsync/helper.rb @@ -1,3 +1,4 @@ +require "fileutils" require "ipaddr" require "shellwords" require "tmpdir" @@ -232,6 +233,8 @@ module VagrantPlugins message: err.to_s end end + ensure + FileUtils.remove_entry_secure(controlpath) if controlpath end # Check if rsync versions support using chown option diff --git a/test/unit/plugins/synced_folders/rsync/helper_test.rb b/test/unit/plugins/synced_folders/rsync/helper_test.rb index 244039a1d..63ce97c21 100644 --- a/test/unit/plugins/synced_folders/rsync/helper_test.rb +++ b/test/unit/plugins/synced_folders/rsync/helper_test.rb @@ -293,6 +293,10 @@ describe VagrantPlugins::SyncedFolderRSync::RsyncHelper do }.and_return(result) subject.rsync_single(machine, ssh_info, opts) + + unless Vagrant::Util::Platform.windows? + expect(File.exist?("/tmp/vagrant-rsync-12345")).to be_falsey + end end end end