Fixes for Ubuntu/Debian.

This commit is contained in:
Ashley Penney 2014-02-18 16:25:42 -05:00
parent 34b8ebf6f5
commit 5eb6e7084d
3 changed files with 6 additions and 3 deletions

View file

@ -64,6 +64,7 @@ describe 'mysql::bindings class' do
class { 'mysql::bindings': class { 'mysql::bindings':
java_enable => true, java_enable => true,
perl_enable => true, perl_enable => true,
php_enable => true,
python_enable => true, python_enable => true,
ruby_enable => true, ruby_enable => true,
java_package_ensure => present, java_package_ensure => present,

View file

@ -24,8 +24,9 @@ describe 'manage_config_file' do
} }
EOS EOS
# Make sure this doesn't exist so we can test if puppet # Make sure this doesn't exist so we can test if puppet
# readded it # readded it. It may not exist in the first place on
shell('rm /etc/my.cnf') # some platforms.
shell('rm /etc/my.cnf', :acceptable_exit_codes => [0,1,2])
apply_manifest(pp, :catch_failures => true) apply_manifest(pp, :catch_failures => true)
end end

View file

@ -191,12 +191,13 @@ describe 'mysql class' do
pp = <<-EOS pp = <<-EOS
class { 'mysql::server': class { 'mysql::server':
root_group => 'test', root_group => 'test',
config_file => '/tmp/mysql_group_test',
} }
EOS EOS
apply_manifest(pp, :catch_failures => true) apply_manifest(pp, :catch_failures => true)
end end
describe file('/etc/my.cnf') do describe file('/tmp/mysql_group_test') do
it { should be_grouped_into 'test' } it { should be_grouped_into 'test' }
end end
end end