fix unit tests

markt-de · Feb 22, 2024 · ae452d6 · ae452d6
1 parent 89f4c5e
commit ae452d6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/spec/acceptance/galera_codership_spec.rb b/spec/acceptance/galera_codership_spec.rb
@@ -21,7 +21,7 @@ class { 'galera':
           deb_sysmaint_password => 'sysmaint',
           configure_firewall    => false,
           galera_servers        => ['127.0.0.1'],
-          galera_master         => $fqdn,
+          galera_master         => $facts['networking']['fqdn'],
           root_password         => 'root_password',
           status_password       => 'status_password',
           override_options      => {

diff --git a/spec/classes/galera_debian_spec.rb b/spec/classes/galera_debian_spec.rb
@@ -30,7 +30,7 @@
 
     context 'when this node is the master' do
       before(:each) do
-        facts.merge!(fqdn: 'control1')
+        facts.merge!(networking: {fqdn: 'control1'})
       end
       let(:node) { 'control1' }
 
@@ -69,7 +69,7 @@
 
     context 'when this node is a slave' do
       before(:each) do
-        facts.merge!(fqdn: 'slave')
+        facts.merge!(networking: {fqdn: 'slave'})
       end
       let(:node) { 'slave' }
 

diff --git a/spec/classes/galera_init_spec.rb b/spec/classes/galera_init_spec.rb
@@ -76,12 +76,12 @@
     end
 
     context 'when node is the master' do
-      before(:each) { params.merge!(galera_master: facts[:fqdn]) }
+      before(:each) { params.merge!(galera_master: facts[:networking][:fqdn]) }
       it { is_expected.to contain_exec('bootstrap_galera_cluster') }
     end
 
     context 'when node is not the master' do
-      before(:each) { params.merge!(galera_master: "not_#{facts[:fqdn]}") }
+      before(:each) { params.merge!(galera_master: "not_#{facts[:networking][:fqdn]}") }
       it { is_expected.not_to contain_exec('bootstrap_galera_cluster') }
     end
 
@@ -142,14 +142,14 @@
     end
 
     context 'when create_root_user=undef (default) and the master' do
-      before(:each) { params.merge!(galera_master: facts[:fqdn]) }
+      before(:each) { params.merge!(galera_master: facts[:networking][:fqdn]) }
       it { is_expected.to contain_class('galera').with(create_root_user: nil) }
       it { is_expected.to contain_class('mysql::server').with(create_root_user: true) }
       it { is_expected.to contain_mysql_user('root@localhost') }
     end
 
     context 'when create_root_user=undef (default) and not the master' do
-      before(:each) { params.merge!(galera_master: "not_#{facts[:fqdn]}") }
+      before(:each) { params.merge!(galera_master: "not_#{facts[:networking][:fqdn]}") }
       it { is_expected.to contain_class('mysql::server').with(create_root_user: false) }
       it { is_expected.not_to contain_mysql_user('root@localhost') }
     end

diff --git a/spec/classes/galera_redhat_spec.rb b/spec/classes/galera_redhat_spec.rb
@@ -38,7 +38,7 @@
     end
 
     context 'when node is the master' do
-      before(:each) { params.merge!(galera_master: facts[:fqdn]) }
+      before(:each) { params.merge!(galera_master: facts[:networking][:fqdn]) }
       it { is_expected.to contain_exec('bootstrap_galera_cluster').with_command(%r{systemctl start [email protected]}) }
     end
 
@@ -52,7 +52,7 @@
 
   shared_examples_for 'galera on RedHat 6' do
     context 'when node is the master' do
-      before(:each) { params.merge!(galera_master: facts[:fqdn]) }
+      before(:each) { params.merge!(galera_master: facts[:networking][:fqdn]) }
       it { is_expected.to contain_exec('bootstrap_galera_cluster').with_command(%r{/etc/init.d/mysql bootstrap-pxc}) }
     end
   end

diff --git a/spec/default_facts.yml b/spec/default_facts.yml
@@ -6,7 +6,7 @@ networking:
   ip: "172.16.254.254"
   ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
   mac: "AA:AA:AA:AA:AA:AA"
+  fqdn: localhost
 is_pe: false
 root_home: "/root"
-fqdn: localhost