openstack/puppet-aodh
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: I91357ee3ac39a42b64304c7d9cd585a6be308184
This commit is contained in:
Takashi Kajinami
2021-12-27 10:28:51 +09:00
parent 16b730bd76
commit 15dd36c991
4 changed files with 2 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spec/spec_helper.rb
View File

@@ -1,4 +1,5 @@
# Load libraries from openstacklib here to simulate how they live together in a real puppet run (for provider unit tests)
# 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'

16
spec/unit/provider/aodh_api_paste_ini/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(:aodh_api_paste_ini).provider(:ini_setting)
describe provider_class do

16
spec/unit/provider/aodh_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(:aodh_api_uwsgi_config).provider(:ini_setting)
describe provider_class do

27
spec/unit/provider/aodh_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(:aodh_config).provider(:openstackconfig)
describe provider_class do