From 701e66b4cae2703c7eefaa84d164d27fcca4a8f3 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 27 Dec 2021 10:37:50 +0900
Subject: [PATCH] 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: I4d346c09ddcd3d1c8a5420f1168dc0f0c06c9a6f
---
 spec/spec_helper.rb                           |  3 ++-
 .../gnocchi_api_paste_ini/ini_setting_spec.rb | 16 -----------
 .../ini_setting_spec.rb                       | 11 --------
 .../gnocchi_config/openstackconfig_spec.rb    | 27 -------------------
 4 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 036c7e4f..33f27e2d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -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'
diff --git a/spec/unit/provider/gnocchi_api_paste_ini/ini_setting_spec.rb b/spec/unit/provider/gnocchi_api_paste_ini/ini_setting_spec.rb
index cd5e7e0f..7a3c73e3 100644
--- a/spec/unit/provider/gnocchi_api_paste_ini/ini_setting_spec.rb
+++ b/spec/unit/provider/gnocchi_api_paste_ini/ini_setting_spec.rb
@@ -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(:gnocchi_api_paste_ini).provider(:ini_setting)
 describe provider_class do
diff --git a/spec/unit/provider/gnocchi_api_uwsgi_config/ini_setting_spec.rb b/spec/unit/provider/gnocchi_api_uwsgi_config/ini_setting_spec.rb
index 6cd2fd03..1271625b 100644
--- a/spec/unit/provider/gnocchi_api_uwsgi_config/ini_setting_spec.rb
+++ b/spec/unit/provider/gnocchi_api_uwsgi_config/ini_setting_spec.rb
@@ -1,14 +1,3 @@
-$LOAD_PATH.push(
-  File.join(
-    File.dirname(__FILE__),
-    '..',
-    '..',
-    '..',
-    'fixtures',
-    'modules',
-    'inifile',
-    'lib')
-)
 require 'spec_helper'
 provider_class = Puppet::Type.type(:gnocchi_api_uwsgi_config).provider(:ini_setting)
 describe provider_class do
diff --git a/spec/unit/provider/gnocchi_config/openstackconfig_spec.rb b/spec/unit/provider/gnocchi_config/openstackconfig_spec.rb
index 7f28ed34..c8f712a7 100644
--- a/spec/unit/provider/gnocchi_config/openstackconfig_spec.rb
+++ b/spec/unit/provider/gnocchi_config/openstackconfig_spec.rb
@@ -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(:gnocchi_config).provider(:openstackconfig)
 describe provider_class do