openstack/puppet-octavia
Code Issues Proposed changes

Load libraries in a single place

Browse Source 
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: I02a8e453e3901ef2b2c1c4b9e8dce5997128f5c2
This commit is contained in:
Takashi Kajinami 2021-12-27 10:52:39 +09:00
parent c1e08f0694
commit 86ce4e6cdf
4 changed files with 3 additions and 81 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 'puppetlabs_spec_helper/module_spec_helper'
require 'shared_examples' require 'shared_examples'
require 'puppet-openstack_spec_helper/facts' require 'puppet-openstack_spec_helper/facts'

27
spec/unit/provider/octavia_api_uwsgi_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 programatcally 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' require 'spec_helper'
provider_class = Puppet::Type.type(:octavia_api_uwsgi_config).provider(:ini_setting) provider_class = Puppet::Type.type(:octavia_api_uwsgi_config).provider(:ini_setting)
describe provider_class do describe provider_class do

27
spec/unit/provider/octavia_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' require 'spec_helper'
provider_class = Puppet::Type.type(:octavia_config).provider(:openstackconfig) provider_class = Puppet::Type.type(:octavia_config).provider(:openstackconfig)
describe provider_class do describe provider_class do

27
spec/unit/provider/octavia_ovn_provider_config/ini_setting_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 programatcally 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' require 'spec_helper'
provider_class = Puppet::Type.type(:octavia_ovn_provider_config).provider(:ini_setting) provider_class = Puppet::Type.type(:octavia_ovn_provider_config).provider(:ini_setting)
describe provider_class do describe provider_class do