Skip to content

Commit c9a9419

Browse files
author
David Swan
committed
[FM-6962] Removal of unsupported OS from mysql
1 parent b8e3772 commit c9a9419

File tree

3 files changed

+5
-18
lines changed

3 files changed

+5
-18
lines changed

metadata.json

-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
{
5050
"operatingsystem": "Scientific",
5151
"operatingsystemrelease": [
52-
"5",
5352
"6",
5453
"7"
5554
]
@@ -64,7 +63,6 @@
6463
{
6564
"operatingsystem": "Debian",
6665
"operatingsystemrelease": [
67-
"7",
6866
"8",
6967
"9"
7068
]

spec/acceptance/types/mysql_plugin_spec.rb

+2-13
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,8 @@
1515
plugin_lib = 'auth_pam.so'
1616
end
1717
elsif fact('osfamily') =~ %r{Debian}
18-
if fact('operatingsystem') =~ %r{Debian}
19-
if fact('operatingsystemrelease') =~ %r{^6\.}
20-
# Only available plugin is innodb which is already loaded and not unload- or reload-able
21-
plugin = nil
22-
elsif fact('operatingsystemrelease') =~ %r{^7\.}
23-
plugin = 'example'
24-
plugin_lib = 'ha_example.so'
25-
end
26-
elsif fact('operatingsystem') =~ %r{Ubuntu}
27-
if fact('operatingsystemrelease') =~ %r{^10\.04}
28-
# Only available plugin is innodb which is already loaded and not unload- or reload-able
29-
plugin = nil
30-
elsif fact('operatingsystemrelease') =~ %r{^16\.04}
18+
if fact('operatingsystem') =~ %r{Ubuntu}
19+
if fact('operatingsystemrelease') =~ %r{^16\.04}
3120
# On Xenial running 5.7.12, the example plugin does not appear to be available.
3221
plugin = 'validate_password'
3322
plugin_lib = 'validate_password.so'

spec/functions/mysql_deepmerge_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
end
2121

2222
# rubocop:disable RSpec/NamedSubject
23-
index_values = %w[one two three]
24-
expected_values_one = %w[1 2 2]
23+
index_values = ['one', 'two', 'three']
24+
expected_values_one = ['1', '2', '2']
2525
it 'is able to mysql_deepmerge two hashes' do
2626
new_hash = subject.execute({ 'one' => '1', 'two' => '1' }, 'two' => '2', 'three' => '2')
2727
index_values.each_with_index do |index, expected|
@@ -59,7 +59,7 @@
5959
end
6060
end
6161

62-
index_values_two = %w[key1 key2]
62+
index_values_two = ['key1', 'key2']
6363
expected_values_four = [{ 'a' => 1, 'b' => 99 }, 'c' => 3]
6464
it 'appends to subhashes 3' do
6565
hash = subject.execute({ 'key1' => { 'a' => 1, 'b' => 2 }, 'key2' => { 'c' => 3 } }, 'key1' => { 'b' => 99 })

0 commit comments

Comments
 (0)