diff --git a/spec/acceptance/mysql_bindings_spec.rb b/spec/acceptance/mysql_bindings_spec.rb index 725ced0..ef05e74 100644 --- a/spec/acceptance/mysql_bindings_spec.rb +++ b/spec/acceptance/mysql_bindings_spec.rb @@ -64,6 +64,7 @@ describe 'mysql::bindings class' do class { 'mysql::bindings': java_enable => true, perl_enable => true, + php_enable => true, python_enable => true, ruby_enable => true, java_package_ensure => present, diff --git a/spec/acceptance/mysql_server_config_spec.rb b/spec/acceptance/mysql_server_config_spec.rb index 246e06c..2cf875e 100644 --- a/spec/acceptance/mysql_server_config_spec.rb +++ b/spec/acceptance/mysql_server_config_spec.rb @@ -24,8 +24,9 @@ describe 'manage_config_file' do } EOS # Make sure this doesn't exist so we can test if puppet - # readded it - shell('rm /etc/my.cnf') + # readded it. It may not exist in the first place on + # some platforms. + shell('rm /etc/my.cnf', :acceptable_exit_codes => [0,1,2]) apply_manifest(pp, :catch_failures => true) end diff --git a/spec/acceptance/mysql_server_spec.rb b/spec/acceptance/mysql_server_spec.rb index 8196884..ad1ea32 100644 --- a/spec/acceptance/mysql_server_spec.rb +++ b/spec/acceptance/mysql_server_spec.rb @@ -191,12 +191,13 @@ describe 'mysql class' do pp = <<-EOS class { 'mysql::server': root_group => 'test', + config_file => '/tmp/mysql_group_test', } EOS apply_manifest(pp, :catch_failures => true) end - describe file('/etc/my.cnf') do + describe file('/tmp/mysql_group_test') do it { should be_grouped_into 'test' } end end