summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMykyta Karpin <mkarpin@mirantis.com>2017-01-31 13:04:16 +0200
committerMykyta Karpin <mkarpin@mirantis.com>2017-01-31 13:07:58 +0200
commitbd8096e59e094431c5b5e9364b90ea7339b58b2c (patch)
tree546dd96d2d3fbff98968c1e2a1cba62e578cadd3
parent53f41e528e4eb8340874d3fa25d32954be5eb0ce (diff)
[puppet4] Workaround for PUP-3336
Noop tests fail to autoload unless lib_dirs aren't added to LOAD_PATH. Change-Id: I7c7ee08ea345afc6f5bbe560f06ab106132288f6 Closes-Bug: #1660579
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+2: Dmitry Ilyin <dilyin@mirantis.com> Workflow+1: Dmitry Ilyin <dilyin@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 31 Jan 2017 13:24:43 +0000 Reviewed-on: https://review.openstack.org/427106 Project: openstack/fuel-noop-fixtures Branch: refs/heads/master
-rw-r--r--spec/spec_helper.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1c943e1..ace6cb7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,11 +9,9 @@ require 'webmock/rspec'
9require_relative '../lib/noop' 9require_relative '../lib/noop'
10 10
11# Add fixture lib dirs to LOAD_PATH. Work-around for PUP-3336 11# Add fixture lib dirs to LOAD_PATH. Work-around for PUP-3336
12if Puppet.version < '4.0.0' 12Noop::Config.list_path_modules.each do |path|
13 Noop::Config.list_path_modules.each do |path| 13 Dir["#{path}/*/lib"].entries.each do |lib_dir|
14 Dir["#{path}/*/lib"].entries.each do |lib_dir| 14 $LOAD_PATH << lib_dir
15 $LOAD_PATH << lib_dir
16 end
17 end 15 end
18end 16end
19 17