Merge pull request #878 from bmjen/fix-grants

(MODULES-3716) Fix mysql_grant tests

spec/acceptance/mysql_backup_spec.rb

@@ -1,18 +1,9 @@
 require 'spec_helper_acceptance'
 require 'puppet'
 require 'puppet/util/package'
+require_relative './mysql_helper.rb'
 
 describe 'mysql::server::backup class' do
-
-  def pre_run
-    apply_manifest("class { 'mysql::server': root_password => 'password' }", :catch_failures => true)
-    @mysql_version = (on default, 'mysql --version').output.chomp.match(/\d+\.\d+\.\d+/)[0]
-  end
-
-  def version_is_greater_than(version)
-    return Puppet::Util::Package.versioncmp(@mysql_version, version) > 0
-  end
-
   context 'should work with no errors' do
     it 'when configuring mysql backups' do
       pp = <<-EOS

spec/acceptance/mysql_helper.rb

@@ -0,0 +1,8 @@
+  def pre_run
+    apply_manifest("class { 'mysql::server': root_password => 'password' }", :catch_failures => true)
+    @mysql_version = (on default, 'mysql --version').output.chomp.match(/\d+\.\d+\.\d+/)[0]
+  end
+
+  def version_is_greater_than(version)
+    return Puppet::Util::Package.versioncmp(@mysql_version, version) > 0
+  end

spec/acceptance/types/mysql_grant_spec.rb

@@ -1,15 +1,17 @@
 require 'spec_helper_acceptance'
+require 'puppet'
+require 'puppet/util/package'
+require_relative '../mysql_helper.rb'
 
 describe 'mysql_grant' do
+  before(:all) do
+    pp = <<-EOS
+      class { 'mysql::server':
+        root_password => 'password',
+      }
+    EOS
 
-  describe 'setup' do
+    apply_manifest(pp, :catch_failures => true)
-    it 'setup mysql::server' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
   end
 
   describe 'missing privileges for user' do
@@ -414,7 +416,7 @@ describe 'mysql_grant' do
       pp = <<-EOS
         if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemmajrelease, '16.00') > 0 {
           exec { 'simpleproc-create':
-            command => 'mysql --database=mysql --delimiter="//" -NBe "CREATE PROCEDURE simpleproc (OUT param1 INT) BEGIN SELECT COUNT(*) INTO param1 FROM t; end//"',
+            command => 'mysql --user="root" --password="password" --database=mysql --delimiter="//" -NBe "CREATE PROCEDURE simpleproc (OUT param1 INT) BEGIN SELECT COUNT(*) INTO param1 FROM t; end//"',
             path    => '/usr/bin/',
             before  => Mysql_user['test2@tester'],
           }
@@ -484,7 +486,10 @@ describe 'mysql_grant' do
     end
 
     it 'should fail with fqdn' do
-      expect(shell("mysql -NBe \"SHOW GRANTS FOR test@fqdn.com\"", { :acceptable_exit_codes => 1}).stderr).to match(/There is no such grant defined for user 'test' on host 'fqdn.com'/)
+      pre_run
+      if ! version_is_greater_than('5.7.0')
+        expect(shell("mysql -NBe \"SHOW GRANTS FOR test@fqdn.com\"", { :acceptable_exit_codes => 1}).stderr).to match(/There is no such grant defined for user 'test' on host 'fqdn.com'/)
+      end
     end
     it 'finds ipv4' do
       shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'192.168.5.7'\"") do |r|