COOK-3752 merge

Author: mattray

.kitchen.yml

@@ -19,7 +19,8 @@ platforms:
 suites:
   - name: client
     run_list:
-      - recipe[mysql::client]
+      - recipe[minitest-handler]
+      - recipe[mysql_test::client]
   - name: ruby
     run_list:
       - recipe[mysql::ruby]

recipes/server.rb

@@ -30,7 +30,7 @@
 
   unless missing_attrs.empty?
     Chef::Application.fatal! "You must set #{missing_attrs.join(', ')} in chef-solo mode." \
-      " For more information, see https://github.com/opscode-cookbooks/mysql#chef-solo-note"
+    " For more information, see https://github.com/opscode-cookbooks/mysql#chef-solo-note"
   end
 else
   # generate all passwords
@@ -84,9 +84,7 @@
   def package(*args, &blk)
     windows_package(*args, &blk)
   end
-end
-
-unless platform_family?('windows')
+else
   group 'mysql' do
     action :create
   end
@@ -98,6 +96,13 @@ def package(*args, &blk)
     home    node['mysql']['data_dir']
     shell   '/sbin/nologin'
   end
+
+  node['mysql']['server']['packages'].each do |name|
+    package name do
+      action   :install
+      notifies :start, 'service[mysql]', :immediately
+    end
+  end
 end
 
 unless platform_family?('mac_os_x')
@@ -130,26 +135,19 @@ def package(*args, &blk)
     source 'my.cnf.erb'
     owner 'root' unless platform? 'windows'
     group node['mysql']['root_group'] unless platform?('windows')
-      mode '0644'
-      case node['mysql']['reload_action']
-      when 'restart'
-        notifies :restart, 'service[mysql]', :delayed
-      when 'reload'
-        notifies :reload, 'service[mysql]', :delayed
-      else
-        Chef::Log.info "my.cnf updated but mysql.reload_action is #{node['mysql']['reload_action']}. No action taken."
-      end
+    mode '0644'
+    case node['mysql']['reload_action']
+    when 'restart'
+      notifies :restart, 'service[mysql]', :delayed
+    when 'reload'
+      notifies :reload, 'service[mysql]', :delayed
+    else
+      Chef::Log.info "my.cnf updated but mysql.reload_action is #{node['mysql']['reload_action']}. No action taken."
+    end
     variables :skip_federated => skip_federated
   end
 end
 
-node['mysql']['server']['packages'].each do |name|
-  package name do
-    action   :install
-    notifies :start, 'service[mysql]', :immediately
-  end
-end
-
 if platform_family?('windows')
   require 'win32/service'
 
@@ -192,9 +190,7 @@ def package(*args, &blk)
     supports     :status => true, :restart => true, :reload => true
     action       :enable
   end
-end
 
-unless platform_family?('mac_os_x')
   template "#{node['mysql']['conf_dir']}/my.cnf" do
     source 'my.cnf.erb'
     owner 'root' unless platform? 'windows'
@@ -248,7 +244,8 @@ def package(*args, &blk)
     end
   end
 
-  service 'mysql' do
+  service 'mysql-start' do
+    service_name node['mysql']['service_name']
     action :start
   end
 end

test/cookbooks/mysql_test/attributes/default.rb

@@ -1,8 +1,8 @@
 # Must be specified for chef-solo for successful re-converge
-override['mysql']['server_root_password'] = 'e;br$il<vOp&Ceth!Hi.en>Roj7'
+override['mysql']['server_root_password'] = 'ilikerandompasswords'
 
-default['mysql_test']['database'] = 'mysql_test'
-default['mysql_test']['username'] = 'test_user'
-default['mysql_test']['password'] = 'neshFiapog'
+override['mysql_test']['database'] = 'mysql_test'
+override['mysql_test']['username'] = 'test_user'
+override['mysql_test']['password'] = 'neshFiapog'
 
 override['mysql']['bind_address'] = 'localhost'

test/cookbooks/mysql_test/files/default/tests/minitest/client_test.rb

@@ -0,0 +1,11 @@
+require File.expand_path('../support/helpers.rb', __FILE__)
+
+describe 'mysql::client' do
+  include Helpers::Mysql
+
+  it 'installs the mysql client package' do
+    node['mysql']['client']['packages'].each do |package_name|
+      package(package_name).must_be_installed
+    end
+  end
+end

test/cookbooks/mysql_test/recipes/client.rb

@@ -1 +1,4 @@
 include_recipe 'yum::epel' if platform_family?('rhel')
+
+include_recipe 'mysql::client'
+

test/cookbooks/mysql_test/recipes/server.rb

@@ -1,6 +1,6 @@
-node.set['mysql']['server_debian_password'] = 'ilikerandompasswords'
-node.set['mysql']['server_root_password']   = 'ilikerandompasswords'
-node.set['mysql']['server_repl_password']   = 'ilikerandompasswords'
+node.override['mysql']['server_debian_password'] = 'ilikerandompasswords'
+node.override['mysql']['server_repl_password']   = 'ilikerandompasswords'
+node.override['mysql']['server_root_password']   = 'ilikerandompasswords'
 
 include_recipe 'mysql::ruby'
 include_recipe 'yum::epel' if platform_family?('rhel')