resolved feedback

Author: lionce

spec/acceptance/locales_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 require 'beaker/i18n_helper'
 
-describe 'mysql localization', if: (os[:family] == 'Debian' || os[:family] == 'Redhat') && (Gem::Version.new(puppet_version) >= Gem::Version.new('4.10.5')) do
+describe 'mysql localization', if: (fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat') && (Gem::Version.new(puppet_version) >= Gem::Version.new('4.10.5')) do
   before :all do
     hosts.each do |host|
       on(host, "sed -i \"96i FastGettext.locale='ja'\" /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet.rb")
@@ -12,7 +12,7 @@
   context 'when triggering puppet simple string error' do
     # 'service_enabled' being set to false can cause random failures in Debian 9
     let(:os_variant) do
-      if os[:release] =~ %r{Debian} && os[:release] =~ %r{^9\.}
+      if os[:family] == 'debian' && os[:release].to_i == '9'
         'true'
       else
         'false'
@@ -76,7 +76,7 @@ class { 'mysql::server::backup':
         host     => 'localhost',
         grant    => ['SELECT', 'UPDATE'],
       }
-    MANIFEST
+      MANIFEST
     end
 
     it 'displays Japanese failure' do

spec/acceptance/mysql_server_spec.rb

@@ -6,8 +6,7 @@
       <<-MANIFEST
         class { 'mysql::server':
           manage_config_file      => 'true',
-          #override_options        => { 'mysqld' => { 'key_buffer_size' => '32M' }},
-          override_options => { 'mysqld' => { 'log-error' => undef }, 'mysqld_safe' => { 'log-error' => false, 'syslog' => true }},
+          override_options        => { 'mysqld' => { 'key_buffer_size' => '32M' }},
           package_ensure          => 'present',
           purge_conf_dir          => 'true',
           remove_default_accounts => 'true',
@@ -47,6 +46,18 @@ class { 'mysql::server':
     it_behaves_like 'a idempotent resource'
   end
 
+  describe 'syslog configuration' do
+    let(:pp) do
+      <<-MANIFEST
+        class { 'mysql::server':
+          override_options => { 'mysqld' => { 'log-error' => undef }, 'mysqld_safe' => { 'log-error' => false, 'syslog' => true }},
+        }
+      MANIFEST
+    end
+
+    it_behaves_like 'a idempotent resource'
+  end
+
   context 'when changing the password' do
     let(:password) { 'THE NEW SECRET' }
     let(:pp) { "class { 'mysql::server': root_password => '#{password}' }" }

spec/acceptance/types/mysql_plugin_spec.rb

@@ -4,18 +4,18 @@
 # of mysql) have varying levels of support for plugins and have
 # different plugins available. Choose a plugin that works or don't try
 # to test plugins if not available.
-if os[:family] =~ %r{Redhat}
-  if os[:release] =~ %r{^5\.}
+if fact('osfamily') == 'RedHat'
+  if os[:release].to_i == '5'
     plugin = nil # Plugins not supported on mysql on RHEL 5
-  elsif os[:release] =~ %r{^6\.}
+  elsif os[:release].to_i == '6'
     plugin     = 'example'
     plugin_lib = 'ha_example.so'
-  elsif os[:release] =~ %r{^7\.}
+  elsif os[:release].to_i == '7'
     plugin     = 'pam'
     plugin_lib = 'auth_pam.so'
   end
-elsif os[:family] =~ %r{Debian}
-  if os[:release] =~ %r{Ubuntu}
+elsif fact('osfamily') == 'Debian'
+  if fact('operatingsystem') =~ %r{Ubuntu}
     if os[:release] =~ %r{^16\.04|^18\.04}
       # On Xenial running 5.7.12, the example plugin does not appear to be available.
       plugin = 'validate_password'
@@ -25,8 +25,8 @@
       plugin_lib = 'ha_example.so'
     end
   end
-elsif os[:family] =~ %r{Suse}
-  plugin = nil # Plugin library path is broken on Suse http://lists.opensuse.org/opensuse-bugs/2013-08/msg01123.html
+elsif fact('osfamily') == 'Suse'
+  plugin = nil # Plugin library path is broken on Suse ttp://lists.opensuse.org/opensuse-bugs/2013-08/msg01123.html
 end
 
 describe 'mysql_plugin' do

spec/spec_helper_acceptance.rb

@@ -36,13 +36,29 @@ def idempotent_apply(hosts, manifest, opts = {}, &block)
 
   # detect the situation where PUP-5016 is triggered and skip the idempotency tests in that case
   # also note how fact('puppetversion') is not available because of PUP-4359
-  if os[:family] == 'Debian' && os[:release] == '8' && shell('puppet --version').stdout =~ %r{^4\.2}
+  if fact('osfamily') == 'Debian' && os[:release].to_i == '8' && shell('puppet --version').stdout =~ %r{^4\.2}
     c.filter_run_excluding skip_pup_5016: true
   end
 
   # Configure all nodes in nodeset
   c.before :suite do
     run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0'))
+    hosts.each do |host|
+      # This will be removed, this is temporary to test localisation.
+
+      if fact('osfamily') == 'Debian'
+        # install language on debian systems
+        install_language_on(host, 'ja_JP.utf-8') if not_controller(host)
+        # This will be removed, this is temporary to test localisation.
+      end
+      # Required for binding tests.
+      if fact('osfamily') == 'RedHat'
+        if os[:release].to_i == '7' || os[:family] == 'fedora'
+          shell('yum install -y bzip2')
+        end
+      end
+      on host, puppet('module', 'install', 'stahnma/epel')
+    end
   end
 end