diff --git a/lib/vagrant-libvirt/action/create_domain.rb b/lib/vagrant-libvirt/action/create_domain.rb index 7fa3a5a..f30d37d 100644 --- a/lib/vagrant-libvirt/action/create_domain.rb +++ b/lib/vagrant-libvirt/action/create_domain.rb @@ -2,7 +2,9 @@ require 'log4r' +require 'vagrant-libvirt/util/erb_template' require 'vagrant-libvirt/util/resolvers' +require 'vagrant-libvirt/util/storage_util' module VagrantPlugins module ProviderLibvirt diff --git a/lib/vagrant-libvirt/action/destroy_domain.rb b/lib/vagrant-libvirt/action/destroy_domain.rb index e6fd96c..95b32f9 100644 --- a/lib/vagrant-libvirt/action/destroy_domain.rb +++ b/lib/vagrant-libvirt/action/destroy_domain.rb @@ -8,6 +8,8 @@ rescue LoadError require 'rexml/rexml' end +require 'vagrant-libvirt/util/domain_flags' + module VagrantPlugins module ProviderLibvirt module Action diff --git a/lib/vagrant-libvirt/action/handle_box_image.rb b/lib/vagrant-libvirt/action/handle_box_image.rb index 37a6f9d..9c91c59 100644 --- a/lib/vagrant-libvirt/action/handle_box_image.rb +++ b/lib/vagrant-libvirt/action/handle_box_image.rb @@ -5,6 +5,8 @@ require 'open3' require 'json' require 'vagrant-libvirt/util/byte_number' +require 'vagrant-libvirt/util/storage_util' +require 'vagrant-libvirt/util/ui' module VagrantPlugins module ProviderLibvirt diff --git a/lib/vagrant-libvirt/action/package_domain.rb b/lib/vagrant-libvirt/action/package_domain.rb index eafa435..825960d 100644 --- a/lib/vagrant-libvirt/action/package_domain.rb +++ b/lib/vagrant-libvirt/action/package_domain.rb @@ -3,6 +3,7 @@ require 'fileutils' require 'log4r' +require 'vagrant-libvirt/util/ui' require 'vagrant-libvirt/util/unindent' module VagrantPlugins diff --git a/lib/vagrant-libvirt/cap/synced_folder_9p.rb b/lib/vagrant-libvirt/cap/synced_folder_9p.rb index 53b1810..251faf2 100644 --- a/lib/vagrant-libvirt/cap/synced_folder_9p.rb +++ b/lib/vagrant-libvirt/cap/synced_folder_9p.rb @@ -7,7 +7,9 @@ require 'digest/md5' require 'vagrant/util/subprocess' require 'vagrant/errors' + require 'vagrant-libvirt/errors' +require 'vagrant-libvirt/util/erb_template' module VagrantPlugins module SyncedFolder9P diff --git a/lib/vagrant-libvirt/cap/synced_folder_virtiofs.rb b/lib/vagrant-libvirt/cap/synced_folder_virtiofs.rb index 2c739b4..c57a6ac 100644 --- a/lib/vagrant-libvirt/cap/synced_folder_virtiofs.rb +++ b/lib/vagrant-libvirt/cap/synced_folder_virtiofs.rb @@ -5,9 +5,11 @@ require 'ostruct' require 'nokogiri' require 'digest/md5' -require 'vagrant/util/subprocess' require 'vagrant/errors' +require 'vagrant/util/subprocess' + require 'vagrant-libvirt/errors' +require 'vagrant-libvirt/util/erb_template' module VagrantPlugins module SyncedFolderVirtioFS diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b161c28..197a473 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -38,13 +38,12 @@ rescue LoadError end end - -require 'vagrant-libvirt' -require 'vagrant-spec/unit' - -Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f } - RSpec.configure do |config| + # set VAGRANT_HOME before any thing that requires vagrant is loaded to prevent + # the global plugin manager from trying to use the default VAGRANT_HOME. + temp_dir = Dir.mktmpdir("rspec-") + ENV['VAGRANT_HOME'] = temp_dir + # ensure that setting of LIBVIRT_DEFAULT_URI in the environment is not picked # up directly by tests, instead they must set as needed. Some build envs will # may have it set to 'qemu:///session'. @@ -52,6 +51,10 @@ RSpec.configure do |config| ENV.delete('LIBVIRT_DEFAULT_URI') end + config.after(:suite) do + FileUtils.remove_entry temp_dir + end + config.mock_with :rspec do |mocks| mocks.verify_partial_doubles = true end @@ -59,3 +62,7 @@ RSpec.configure do |config| # don't run acceptance tests by default config.filter_run_excluding :acceptance => true end + +require 'vagrant-spec/unit' + +Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f } diff --git a/spec/unit/plugin_spec.rb b/spec/unit/plugin_spec.rb index 12a5395..0f8ce7b 100644 --- a/spec/unit/plugin_spec.rb +++ b/spec/unit/plugin_spec.rb @@ -3,6 +3,7 @@ require 'spec_helper' require 'support/sharedcontext' +require 'vagrant-libvirt' require 'vagrant-libvirt/plugin'