openstack
/
puppet-glance
Code Issues Proposed changes

Load libraries in a single place 

This change refactors how the dependent libraries are loaded during
unit tests, and load the libraries in the base spec_helper to avoid
duplicate and redundant implementations.

Change-Id: I92ba82bfba4ab4e47e0f704ea71433cd98fc03d2
This commit is contained in:
Takashi Kajinami 2021-12-27 10:36:51 +09:00
parent e832ed4069
commit 49c562d390
7 changed files with 4 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec/spec_helper.rb
View File

@ -1,3 +1,6 @@
# Load libraries here to simulate how they live together in a real puppet run (for provider unit tests)
$LOAD_PATH.push(File.join(File.dirname(__FILE__), 'fixtures', 'modules', 'inifile', 'lib'))
$LOAD_PATH.push(File.join(File.dirname(__FILE__), 'fixtures', 'modules', 'openstacklib', 'lib'))
require 'puppetlabs_spec_helper/module_spec_helper'
require 'shared_examples'
require 'puppet-openstack_spec_helper/facts'

27
spec/unit/provider/glance_api_config/openstackconfig_spec.rb
View File

@ -1,30 +1,3 @@
#
# these tests are a little concerning b/c they are hacking around the
# modulepath, so these tests will not catch issues that may eventually arise
# related to loading these plugins.
# I could not, for the life of me, figure out how to programmatically set the modulepath
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:glance_api_config).provider(:openstackconfig)
describe provider_class do

24
spec/unit/provider/glance_api_paste_ini/ini_setting_spec.rb
View File

@ -1,25 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:glance_api_paste_ini).provider(:ini_setting)
describe provider_class do
@ -60,4 +38,4 @@ describe provider_class do
expect(resource[:ensure]).to eq :absent
end
end
end

16
spec/unit/provider/glance_api_uwsgi_config/ini_setting_spec.rb
View File

@ -1,19 +1,3 @@
#
# these tests are a little concerning b/c they are hacking around the
# modulepath, so these tests will not catch issues that may eventually arise
# related to loading these plugins.
# I could not, for the life of me, figure out how to programatcally set the modulepath
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:glance_api_uwsgi_config).provider(:ini_setting)
describe provider_class do

23
spec/unit/provider/glance_cache_config/ini_setting_spec.rb
View File

@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:glance_cache_config).provider(:ini_setting)

23
spec/unit/provider/glance_image_import_config/ini_setting_spec.rb
View File

@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:glance_image_import_config).provider(:ini_setting)

12
spec/unit/provider/glance_swift_config/ini_setting_spec.rb
View File

@ -1,15 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:glance_swift_config).provider(:ini_setting)