diff --git a/metadata.json b/metadata.json index 7706b1f25..230a93d23 100644 --- a/metadata.json +++ b/metadata.json @@ -49,7 +49,6 @@ { "operatingsystem": "Scientific", "operatingsystemrelease": [ - "5", "6", "7" ] @@ -64,7 +63,6 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "7", "8", "9" ] diff --git a/spec/acceptance/types/mysql_plugin_spec.rb b/spec/acceptance/types/mysql_plugin_spec.rb index 463523a8e..1950df6c2 100644 --- a/spec/acceptance/types/mysql_plugin_spec.rb +++ b/spec/acceptance/types/mysql_plugin_spec.rb @@ -15,19 +15,8 @@ plugin_lib = 'auth_pam.so' end elsif fact('osfamily') =~ %r{Debian} - if fact('operatingsystem') =~ %r{Debian} - if fact('operatingsystemrelease') =~ %r{^6\.} - # Only available plugin is innodb which is already loaded and not unload- or reload-able - plugin = nil - elsif fact('operatingsystemrelease') =~ %r{^7\.} - plugin = 'example' - plugin_lib = 'ha_example.so' - end - elsif fact('operatingsystem') =~ %r{Ubuntu} - if fact('operatingsystemrelease') =~ %r{^10\.04} - # Only available plugin is innodb which is already loaded and not unload- or reload-able - plugin = nil - elsif fact('operatingsystemrelease') =~ %r{^16\.04} + if fact('operatingsystem') =~ %r{Ubuntu} + if fact('operatingsystemrelease') =~ %r{^16\.04} # On Xenial running 5.7.12, the example plugin does not appear to be available. plugin = 'validate_password' plugin_lib = 'validate_password.so' diff --git a/spec/functions/mysql_deepmerge_spec.rb b/spec/functions/mysql_deepmerge_spec.rb index e44db6cd2..e5e9a66ef 100644 --- a/spec/functions/mysql_deepmerge_spec.rb +++ b/spec/functions/mysql_deepmerge_spec.rb @@ -20,8 +20,8 @@ end # rubocop:disable RSpec/NamedSubject - index_values = %w[one two three] - expected_values_one = %w[1 2 2] + index_values = ['one', 'two', 'three'] + expected_values_one = ['1', '2', '2'] it 'is able to mysql_deepmerge two hashes' do new_hash = subject.execute({ 'one' => '1', 'two' => '1' }, 'two' => '2', 'three' => '2') index_values.each_with_index do |index, expected| @@ -59,7 +59,7 @@ end end - index_values_two = %w[key1 key2] + index_values_two = ['key1', 'key2'] expected_values_four = [{ 'a' => 1, 'b' => 99 }, 'c' => 3] it 'appends to subhashes 3' do hash = subject.execute({ 'key1' => { 'a' => 1, 'b' => 2 }, 'key2' => { 'c' => 3 } }, 'key1' => { 'b' => 99 })