From 789b8f107f2fccc1a6092060c43369a82c4f799e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 27 Dec 2021 10:43:02 +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: I35a471f48a35a8466445e402cfcd93efa1f377f9
---
 spec/spec_helper.rb                           |  3 +++
 .../mistral_config/openstackconfig_spec.rb    | 27 -------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4a5c46c..33f27e2 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/mistral_config/openstackconfig_spec.rb b/spec/unit/provider/mistral_config/openstackconfig_spec.rb
index 0416155..3147bf4 100644
--- a/spec/unit/provider/mistral_config/openstackconfig_spec.rb
+++ b/spec/unit/provider/mistral_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 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'
 provider_class = Puppet::Type.type(:mistral_config).provider(:openstackconfig)
 describe provider_class do