Merge pull request #3551 from benesch/3550

core: return {} if cached synced folders file missing [GH-3550]

lib/vagrant/action/builtin/mixin_synced_folders.rb

@@ -214,7 +214,10 @@ module Vagrant
             end
           end
         rescue Errno::ENOENT
-          return nil
+          # If the file doesn't exist, we probably just have a machine created
+          # by a version of Vagrant that didn't cache shared folders. Report no
+          # shared folders to be safe.
+          return {}
         end
       end
     end

test/unit/vagrant/action/builtin/mixin_synced_folders_test.rb

@@ -136,9 +136,9 @@ describe Vagrant::Action::Builtin::MixinSyncedFolders do
       expect(result[:nfs]["root"][:foo]).to eql("bar")
     end
 
-    it "returns nil if cached read with no cache" do
+    it "returns {} if cached read with no cache" do
       result = subject.synced_folders(machine, cached: true)
-      expect(result).to be_nil
+      expect(result).to eql({})
     end
 
     it "should be able to save and retrieve cached versions" do