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

Merge pull request #878 from bmjen/fix-grants

Browse source 
(MODULES-3716) Fix mysql_grant tests
This commit is contained in:
Hunter Haugen 2016-08-17 14:49:18 -07:00 committed by GitHub
commit 4aa98b14ed
3 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
spec/acceptance/mysql_backup_spec.rb
View file

@ -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

8
spec/acceptance/mysql_helper.rb Normal file
View file

@ -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

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

@ -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
it 'setup mysql::server' do
pp = <<-EOS
class { 'mysql::server': }
EOS
apply_manifest(pp, :catch_failures => true)
end
apply_manifest(pp, :catch_failures => true)
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|