lib/kitchen/driver/vagrant.rb in kitchen-vagrant-1.0.1 vs lib/kitchen/driver/vagrant.rb in kitchen-vagrant-1.0.2

@@ -467,13 +467,16 @@
 
       # @return [String] full local path to the directory containing the
       #   instance's Vagrantfile
       # @api private
       def vagrant_root
-        root = File.join(config[:kitchen_root], %w{.kitchen kitchen-vagrant},
-          "kitchen-#{File.basename(config[:kitchen_root])}-#{instance.name}"
-        )
-        @vagrant_root ||= instance.nil? ? nil : root
+        if !@vagrant_root && !instance.nil?
+          @vagrant_root = File.join(
+            config[:kitchen_root], %w{.kitchen kitchen-vagrant},
+            "kitchen-#{File.basename(config[:kitchen_root])}-#{instance.name}"
+          )
+        end
+        @vagrant_root
       end
 
       # @param type [Symbol] either `:ssh` or `:winrm`
       # @return [Hash] key/value pairs resulting from parsing a
       #   `vagrant ssh-config` or `vagrant winrm-config` local command