Merge pull request #454 from apenney/pe-test-fails

Fixes for Ubuntu/Debian.

Author: Ashley Penney

spec/acceptance/mysql_bindings_spec.rb

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

spec/acceptance/mysql_server_config_spec.rb

@@ -24,8 +24,9 @@ class { 'mysql::server':
       }
     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
 

spec/acceptance/mysql_server_spec.rb

@@ -191,12 +191,13 @@ class { 'mysql::server':
       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