From 7417ab6f47ac8e0f1147281b0900e08d1ea424bc Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 27 Dec 2021 10:39:10 +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: I9d50d972e543f7cc51c7d12e1a307630dc0e399c
---
 spec/spec_helper.rb                           |  3 ++
 .../ironic_config/openstackconfig_spec.rb     | 27 ------------------
 .../openstackconfig_spec.rb                   | 28 -------------------
 3 files changed, 3 insertions(+), 55 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4a5c46c3..33f27e2d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -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'
diff --git a/spec/unit/provider/ironic_config/openstackconfig_spec.rb b/spec/unit/provider/ironic_config/openstackconfig_spec.rb
index 48984544..61718f22 100644
--- a/spec/unit/provider/ironic_config/openstackconfig_spec.rb
+++ b/spec/unit/provider/ironic_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(:ironic_config).provider(:openstackconfig)
 describe provider_class do
diff --git a/spec/unit/provider/ironic_inspector_config/openstackconfig_spec.rb b/spec/unit/provider/ironic_inspector_config/openstackconfig_spec.rb
index dd94faaf..a8edd548 100644
--- a/spec/unit/provider/ironic_inspector_config/openstackconfig_spec.rb
+++ b/spec/unit/provider/ironic_inspector_config/openstackconfig_spec.rb
@@ -1,31 +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(:ironic_inspector_config).provider(:openstackconfig)