Merge pull request #65 from OpenVoxProject/gh-64-acceptance-openvox7

(gh-64) Fix two acceptance tests for openvox7

Author: bastelfreak

acceptance/tests/validate_vendored_openssl.rb

@@ -19,9 +19,15 @@ def create_bat_wrapper(host, file, command)
   agents.each do |agent|
     openssl = openssl_command(agent)
 
+    puppet_version = on(agent, puppet('--version')).stdout.chomp
+    expected_openssl = case puppet_version
+                       when /^7\./ then 1
+                       else 3
+                       end
+
     step "check openssl version" do
       on(agent, "#{openssl} version -v") do |result|
-        assert_match(/^OpenSSL 3\./, result.stdout)
+        assert_match(/^OpenSSL #{expected_openssl}\./, result.stdout)
       end
     end
 

acceptance/tests/validate_vendored_ruby.rb

@@ -21,7 +21,10 @@ def setup_build_environment(agent)
   # We add `--enable-system-libraries` to use system libsqlite3
   gem_install_sqlite3 = "env GEM_HOME=/opt/puppetlabs/puppet/lib/ruby/vendor_gems " + gem_command(agent) + " install sqlite3 -- --enable-system-libraries"
   install_package_on_agent = package_installer(agent)
-  rubygems_version = agent['platform'] =~ /aix-7\.2/ ? '3.4.22' : ''
+
+  puppet_version = on(agent, puppet('--version')).stdout.chomp
+  rubygems_version = ((agent['platform'] =~ /aix-7\.2/) ||
+                      (puppet_version =~ /^7\./)) ? '3.4.22' : ''
   on(agent, "#{gem_command(agent)} update --system #{rubygems_version}")
 
   case agent['platform']