Merge pull request #1236 from puppetlabs/fix_acceptance_tests

add package lsb_release for puppet fact, and fix grant test

Author: carabasdaniel

spec/acceptance/types/mysql_grant_spec.rb

@@ -6,9 +6,6 @@
       class { 'mysql::server':
         root_password => 'password',
       }
-      package {'which':
-        ensure => present,
-      }
     MANIFEST
 
     apply_manifest(pp, catch_failures: true)

spec/spec_helper_acceptance_local.rb

@@ -14,3 +14,14 @@ def mysql_version
   mysql_version = shell_output.stdout.match(%r{\d+\.\d+\.\d+})[0]
   mysql_version
 end
+
+RSpec.configure do |c|
+  c.before :suite do
+    if os[:family] == 'debian' || os[:family] == 'ubuntu'
+      # needed for the puppet fact
+      apply_manifest("package { 'lsb-release': ensure => installed, }", expect_failures: false)
+    end
+    # needed for the grant tests, not installed on el7 docker images
+    apply_manifest("package { 'which': ensure => installed, }", expect_failures: false)
+  end
+end