From d31f9a59a5b9f9602b2edbac53a780a868eaebe0 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 2 Aug 2022 10:44:07 -0700 Subject: [PATCH] Only patch fake_ftp when running tests The fake_ftp patches should only be applied when running tests. Since the library is a development dependency only, it will not be available for loading from a release. --- lib/vagrant.rb | 3 --- test/unit/base.rb | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/vagrant.rb b/lib/vagrant.rb index 151fc6d35..d36ab8adb 100644 --- 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 diff --git a/test/unit/base.rb b/test/unit/base.rb index 016ba6a94..e40739549 100644 --- 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__)