Merge pull request #12826 from chrisroberts/fix-fake-ftp-patching

Only patch fake_ftp when running tests
2022-08-02 14:34:47 -07:00 · 2022-08-02 14:34:47 -07:00 · feb763caaf
commit feb763caaf
parent 8e83537f7d d31f9a59a5
2 changed files with 3 additions and 3 deletions
--- a/lib/vagrant.rb
+++ b/lib/vagrant.rb
@ -18,9 +18,6 @@ end
 # Add our patches to net-ssh
 require "vagrant/patches/net-ssh"

-# Add our patches to fake_ftp
-require "vagrant/patches/fake_ftp"
-
 require "optparse"

 module Vagrant
--- a/test/unit/base.rb
+++ b/test/unit/base.rb
@ -10,6 +10,9 @@ require "rspec/its"
 require "vagrant"
 require "vagrant/util/platform"

+# Include patches for fake ftp
+require "vagrant/patches/fake_ftp"
+
 # Add the test directory to the load path
 $:.unshift File.expand_path("../../", __FILE__)