Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(maint) Various test fixes #52

Merged
merged 3 commits into from
Nov 15, 2016
Merged

(maint) Various test fixes #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f6960d
(maint) Installs pe_gem on PE 3.x
bmjen Nov 14, 2016
bb798f9
(maint) Ensure that tests use latest hocon gem
bmjen Nov 15, 2016
932bba4
(maint) Fixes test to expect json format from hocon 1.0+
bmjen Nov 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spec/acceptance/conf_setting_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
{
"setting => 'test.foo', value => 'bar'," => "test {\n foo = bar\n}",
"setting => 'more.baz', value => 'quux'," => "more {\n baz = quux\n}",
"setting => 'top', value => 'level'," => "top : \"level\"",
"setting => 'top', value => 'level'," => "top: \"level\"",
}.each do |parameter_list, content|
context parameter_list do
pp = <<-EOS
Expand Down
7 changes: 4 additions & 3 deletions spec/spec_helper_acceptance.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
puppet_version = (on default, puppet('--version')).output.chomp

if puppet_version =~ /Puppet Enterprise /
on host, puppet('resource package hocon provider=pe_gem')
on host, puppet('module install puppetlabs-pe_gem')
on host, puppet('resource package hocon ensure=latest provider=pe_gem')
elsif ENV['PUPPET_INSTALL_TYPE'] != 'foss' && Gem::Version.new(puppet_version) >= Gem::Version.new('4.0.0')
on host, puppet('resource package hocon provider=puppet_gem')
on host, puppet('resource package hocon ensure=latest provider=puppet_gem')
else
on host, puppet('resource package hocon provider=gem')
on host, puppet('resource package hocon ensure=latest provider=gem')
end
end
end
Expand Down