opuppet/module-puppetlabs-mysql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #874 from bmjen/fix-grants

Browse source 
Fixes procedure grant tests for 5.7.12
This commit is contained in:
Hunter Haugen 2016-08-11 16:51:05 -07:00 committed by GitHub
commit 05c4bafdb5
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
spec/acceptance/types/mysql_grant_spec.rb
View file

@ -412,12 +412,19 @@ describe 'mysql_grant' do
describe 'adding procedure privileges' do describe 'adding procedure privileges' do
it 'should work without errors' do it 'should work without errors' do
pp = <<-EOS 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//"',
path => '/usr/bin/',
before => Mysql_user['test2@tester'],
}
}
mysql_user { 'test2@tester': mysql_user { 'test2@tester':
ensure => present, ensure => present,
} }
mysql_grant { 'test2@tester/PROCEDURE test.simpleproc': mysql_grant { 'test2@tester/PROCEDURE mysql.simpleproc':
ensure => 'present', ensure => 'present',
table => 'PROCEDURE test.simpleproc', table => 'PROCEDURE mysql.simpleproc',
user => 'test2@tester', user => 'test2@tester',
privileges => ['EXECUTE'], privileges => ['EXECUTE'],
require => Mysql_user['test2@tester'], require => Mysql_user['test2@tester'],
@ -429,7 +436,7 @@ describe 'mysql_grant' do
it 'should find the user' do it 'should find the user' do
shell("mysql -NBe \"SHOW GRANTS FOR test2@tester\"") do |r| shell("mysql -NBe \"SHOW GRANTS FOR test2@tester\"") do |r|
expect(r.stdout).to match(/GRANT EXECUTE ON PROCEDURE `test`.`simpleproc` TO 'test2'@'tester'/) expect(r.stdout).to match(/GRANT EXECUTE ON PROCEDURE `mysql`.`simpleproc` TO 'test2'@'tester'/)
expect(r.stderr).to be_empty expect(r.stderr).to be_empty
end end
end end