Skip to content

Commit c55daa7

Browse files
committed
(maint) spec default for root_home fact
1 parent 0654c5f commit c55daa7

11 files changed

+14
-28
lines changed

.sync.yml

+4
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,7 @@ Rakefile:
2020
extra_disabled_lint_checks:
2121
- anchor_resource
2222
- params_empty_string_assignment
23+
24+
spec/default_facts.yml:
25+
extra_facts:
26+
root_home: /root

spec/classes/mycnf_template_spec.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
describe 'mysql::server' do
66
on_supported_os.each do |os, facts|
77
context "my.cnf template - on #{os}" do
8-
let(:facts) do
9-
facts.merge(root_home: '/root')
10-
end
8+
let(:facts) { facts }
119

1210
context 'normal entry' do
1311
let(:params) { { override_options: { 'mysqld' => { 'socket' => '/var/lib/mysql/mysql.sock' } } } }

spec/classes/mysql_backup_mysqldump_spec.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
describe 'mysql::backup::mysqldump' do
66
on_supported_os.each do |os, facts|
77
context "on #{os}" do
8+
let(:facts) { facts }
89
let(:pre_condition) do
910
<<-MANIFEST
1011
class { 'mysql::server': }
1112
MANIFEST
1213
end
13-
let(:facts) do
14-
facts.merge(root_home: '/root')
15-
end
1614

1715
let(:default_params) do
1816
{ 'backupuser' => 'testuser',

spec/classes/mysql_backup_xtrabackup_spec.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ class { 'mysql::server': }
1111
MANIFEST
1212
end
1313
let(:facts) do
14-
facts.merge(root_home: '/root',
15-
mysql_version: '5.7',
14+
facts.merge(mysql_version: '5.7',
1615
mysld_version: 'mysqld Ver 5.7.38 for Linux on x86_64 (MySQL Community Server - (GPL)')
1716
end
1817

spec/classes/mysql_bindings_spec.rb

+1-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
next if facts[:os]['family'] == 'Archlinux'
88

99
context "on #{os}" do
10-
let(:facts) do
11-
facts.merge(root_home: '/root')
12-
end
13-
10+
let(:facts) { facts }
1411
let(:params) do
1512
{
1613
'java_enable' => true,

spec/classes/mysql_client_spec.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
describe 'mysql::client' do
66
on_supported_os.each do |os, facts|
77
context "on #{os}" do
8-
let(:facts) do
9-
facts.merge(root_home: '/root')
10-
end
8+
let(:facts) { facts }
119

1210
context 'with defaults' do
1311
it { is_expected.to contain_class('mysql::params') }

spec/classes/mysql_server_account_security_spec.rb

-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
let(:facts) do
1717
override_facts(
1818
super(),
19-
'root_home' => '/root',
2019
'networking' => {
2120
'fqdn' => 'myhost.mydomain',
2221
'hostname' => 'myhost',
@@ -55,7 +54,6 @@
5554
let(:facts) do
5655
override_facts(
5756
super(),
58-
'root_home' => '/root',
5957
'networking' => {
6058
'fqdn' => 'localhost',
6159
'hostname' => 'localhost',
@@ -79,7 +77,6 @@
7977
let(:facts) do
8078
override_facts(
8179
super(),
82-
'root_home' => '/root',
8380
'networking' => {
8481
'fqdn' => 'localhost.localdomain',
8582
'hostname' => 'localhost',

spec/classes/mysql_server_backup_spec.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
class { 'mysql::server': }
1111
MANIFEST
1212
end
13-
let(:facts) do
14-
facts.merge(root_home: '/root')
15-
end
13+
let(:facts) { facts }
1614

1715
let(:default_params) do
1816
{ 'backupuser' => 'testuser',

spec/classes/mysql_server_spec.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
describe 'mysql::server' do
66
on_supported_os.each do |os, facts|
77
context "on #{os}" do
8-
let(:facts) do
9-
facts.merge(root_home: '/root')
10-
end
8+
let(:facts) { facts }
119

1210
context 'with defaults' do
1311
it { is_expected.to contain_class('mysql::params') }

spec/default_facts.yml

+2
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ networking:
77
ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
88
mac: "AA:AA:AA:AA:AA:AA"
99
is_pe: false
10+
root_home: "/root"
11+

spec/defines/mysql_db_spec.rb

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
describe 'mysql::db', type: :define do
66
on_supported_os.each do |os, facts|
77
context "on #{os}" do
8-
let(:facts) do
9-
facts.merge(root_home: '/root')
10-
end
11-
8+
let(:facts) { facts }
129
let(:title) { 'test_db' }
1310

1411
let(:params) do

0 commit comments

Comments
 (0)