(MODULES-3716) Fixes mysql_grant tests to create procedure before grant

This commit is contained in:
Bryan Jen 2016-08-17 09:55:33 -07:00
parent 561ad9a7a7
commit 0ea083b643

View file

@ -2,14 +2,14 @@ require 'spec_helper_acceptance'
describe 'mysql_grant' do describe 'mysql_grant' do
describe 'setup' do before(:all) do
it 'setup mysql::server' do pp = <<-EOS
pp = <<-EOS class { 'mysql::server':
class { 'mysql::server': } root_password => 'password',
EOS }
EOS
apply_manifest(pp, :catch_failures => true) apply_manifest(pp, :catch_failures => true)
end
end end
describe 'missing privileges for user' do describe 'missing privileges for user' do
@ -414,7 +414,7 @@ describe 'mysql_grant' do
pp = <<-EOS pp = <<-EOS
if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemmajrelease, '16.00') > 0 { if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemmajrelease, '16.00') > 0 {
exec { 'simpleproc-create': 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/', path => '/usr/bin/',
before => Mysql_user['test2@tester'], before => Mysql_user['test2@tester'],
} }