Merge pull request #52 from bmjen/fix-ci

(maint) Various test fixes
puppetlabs · Nov 15, 2016 · 0b234ce · 0b234ce
2 parents 949b326 + 932bba4
commit 0b234ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/spec/acceptance/conf_setting_spec.rb b/spec/acceptance/conf_setting_spec.rb
@@ -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

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -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