Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FM-6962] Removal of unsupported OS from mysql #1086

Merged
merged 1 commit into from
Jun 1, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -49,7 +49,6 @@
{
"operatingsystem": "Scientific",
"operatingsystemrelease": [
"5",
"6",
"7"
]
@@ -64,7 +63,6 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"7",
"8",
"9"
]
15 changes: 2 additions & 13 deletions spec/acceptance/types/mysql_plugin_spec.rb
Original file line number Diff line number Diff line change
@@ -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'
6 changes: 3 additions & 3 deletions spec/functions/mysql_deepmerge_spec.rb
Original file line number Diff line number Diff line change
@@ -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 })