Skip to content

Commit 72812af

Browse files
committed
fix acceptance tests
1 parent cfebd3e commit 72812af

7 files changed

+19
-19
lines changed

spec/helpers/acceptance/tests/component_template_shared_examples.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@
5757
shared_examples 'component template operations' do |es_config, component_template|
5858
describe 'template resources' do
5959
before :all do # rubocop:disable RSpec/BeforeAfterAll
60-
shell "mkdir -p #{default['distmoduledir']}/another/files"
60+
shell "mkdir -p #{default.puppet['codedir']}/modules/another/files"
6161

6262
create_remote_file(
6363
default,
64-
"#{default['distmoduledir']}/another/files/good.json",
64+
"#{default.puppet['codedir']}/modules/another/files/good.json",
6565
JSON.dump(component_template)
6666
)
6767

6868
create_remote_file(
6969
default,
70-
"#{default['distmoduledir']}/another/files/bad.json",
70+
"#{default.puppet['codedir']}/modules/another/files/bad.json",
7171
JSON.dump(component_template)[0..-5]
7272
)
7373
end

spec/helpers/acceptance/tests/ilm_policy_shared_examples.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@
5757
shared_examples 'ILM policy operations' do |es_config, ilm_policy|
5858
describe 'policy resources' do
5959
before :all do # rubocop:disable RSpec/BeforeAfterAll
60-
shell "mkdir -p #{default['distmoduledir']}/another/files"
60+
shell "mkdir -p #{default.puppet['codedir']}/modules/another/files"
6161

6262
create_remote_file(
6363
default,
64-
"#{default['distmoduledir']}/another/files/good.json",
64+
"#{default.puppet['codedir']}/modules/another/files/good.json",
6565
JSON.dump(ilm_policy)
6666
)
6767

6868
create_remote_file(
6969
default,
70-
"#{default['distmoduledir']}/another/files/bad.json",
70+
"#{default.puppet['codedir']}/modules/another/files/bad.json",
7171
JSON.dump(ilm_policy)[0..-5]
7272
)
7373
end

spec/helpers/acceptance/tests/index_template_shared_examples.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@
5757
shared_examples 'index template operations' do |es_config, index_template|
5858
describe 'template resources' do
5959
before :all do # rubocop:disable RSpec/BeforeAfterAll
60-
shell "mkdir -p #{default['distmoduledir']}/another/files"
60+
shell "mkdir -p #{default.puppet['codedir']}/modules/another/files"
6161

6262
create_remote_file(
6363
default,
64-
"#{default['distmoduledir']}/another/files/good.json",
64+
"#{default.puppet['codedir']}/modules/another/files/good.json",
6565
JSON.dump(index_template)
6666
)
6767

6868
create_remote_file(
6969
default,
70-
"#{default['distmoduledir']}/another/files/bad.json",
70+
"#{default.puppet['codedir']}/modules/another/files/bad.json",
7171
JSON.dump(index_template)[0..-5]
7272
)
7373
end

spec/helpers/acceptance/tests/package_url_shared_examples.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@
5353

5454
context 'via puppet paths', :with_cleanup do
5555
before :all do # rubocop:disable RSpec/BeforeAfterAll
56-
shell "mkdir -p #{default['distmoduledir']}/another/files"
56+
shell "mkdir -p #{default.puppet['codedir']}/modules/another/files"
5757

5858
scp_to default,
5959
v[:elasticsearch_package][:path],
60-
"#{default['distmoduledir']}/another/files/#{v[:elasticsearch_package][:filename]}"
60+
"#{default.puppet['codedir']}/modules/another/files/#{v[:elasticsearch_package][:filename]}"
6161
end
6262

6363
let(:manifest_class_parameters) do

spec/helpers/acceptance/tests/plugin_shared_examples.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
shared_examples 'plugin acceptance tests' do |es_config, plugins|
99
describe 'elasticsearch::plugin' do
1010
before :all do # rubocop:disable RSpec/BeforeAfterAll
11-
shell "mkdir -p #{default['distmoduledir']}/another/files"
11+
shell "mkdir -p #{default.puppet['codedir']}/modules/another/files"
1212
end
1313

1414
describe 'invalid plugins', :with_cleanup do
@@ -53,7 +53,7 @@
5353
scp_to(
5454
default,
5555
meta[:path],
56-
"#{default['distmoduledir']}/another/files/#{plugin}.zip"
56+
"#{default.puppet['codedir']}/modules/another/files/#{plugin}.zip"
5757
)
5858
end
5959

spec/helpers/acceptance/tests/slm_policy_shared_examples.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,17 @@
6161
shared_examples 'SLM policy operations' do |es_config, slm_policy|
6262
describe 'policy resources' do
6363
before :all do # rubocop:disable RSpec/BeforeAfterAll
64-
shell "mkdir -p #{default['distmoduledir']}/another/files"
64+
shell "mkdir -p #{default.puppet['codedir']}/modules/another/files"
6565

6666
create_remote_file(
6767
default,
68-
"#{default['distmoduledir']}/another/files/good.json",
68+
"#{default.puppet['codedir']}/modules/another/files/good.json",
6969
JSON.dump(slm_policy)
7070
)
7171

7272
create_remote_file(
7373
default,
74-
"#{default['distmoduledir']}/another/files/bad.json",
74+
"#{default.puppet['codedir']}/modules/another/files/bad.json",
7575
JSON.dump(slm_policy)[0..-5]
7676
)
7777
end

spec/helpers/acceptance/tests/template_shared_examples.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@
5757
shared_examples 'template operations' do |es_config, template|
5858
describe 'template resources' do
5959
before :all do # rubocop:disable RSpec/BeforeAfterAll
60-
shell "mkdir -p #{default['distmoduledir']}/another/files"
60+
shell "mkdir -p #{default.puppet['codedir']}/modules/another/files"
6161

6262
create_remote_file(
6363
default,
64-
"#{default['distmoduledir']}/another/files/good.json",
64+
"#{default.puppet['codedir']}/modules/another/files/good.json",
6565
JSON.dump(template)
6666
)
6767

6868
create_remote_file(
6969
default,
70-
"#{default['distmoduledir']}/another/files/bad.json",
70+
"#{default.puppet['codedir']}/modules/another/files/bad.json",
7171
JSON.dump(template)[0..-5]
7272
)
7373
end

0 commit comments

Comments
 (0)