openstack/puppet-swift
Code Issues Proposed changes

Merge "CentOS9: Fix unit tests related to use_xinetd"

Browse Source
This commit is contained in:
Zuul
2021-12-23 08:42:32 +00:00
committed by Gerrit Code Review
parent 29e0bd9c8f 5a7a299a54
commit 2253752540
3 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spec/classes/swift_ringserver_spec.rb
View File

@@ -7,7 +7,6 @@ describe 'swift::ringserver' do
let :params do
{ :local_net_ip => '127.0.0.1',
:max_connections => 5,
:rsync_use_xinetd => true,
}
end
@@ -43,7 +42,7 @@ describe 'swift::ringserver' do
it 'does create the rsync::server class' do
is_expected.to contain_class('rsync::server').with({
'use_xinetd' => 'true',
'use_xinetd' => platform_params[:xinetd_available],
'address' => '127.0.0.1',
'use_chroot' => 'no'
})
@@ -70,6 +69,19 @@ describe 'swift::ringserver' do
facts.merge(OSDefaults.get_facts())
end
let (:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :xinetd_available => true }
when 'RedHat'
if facts[:operatingsystemmajrelease] > '8'
{ :xinetd_available => false }
else
{ :xinetd_available => true }
end
end
end
it_behaves_like 'swift::ringserver'
end
end

16
spec/classes/swift_storage_all_spec.rb
View File

@@ -119,10 +119,9 @@ describe 'swift::storage::all' do
)}
it { is_expected.to contain_class('rsync::server').with(
{:use_xinetd => true,
:use_xinetd => platform_params[:xinetd_available],
:address => param_hash[:storage_local_net_ip],
:use_chroot => 'no'
}
)}
end
end
@@ -226,6 +225,19 @@ describe 'swift::storage::all' do
facts.merge(OSDefaults.get_facts())
end
let (:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :xinetd_available => true }
when 'RedHat'
if facts[:operatingsystemmajrelease] > '8'
{ :xinetd_available => false }
else
{ :xinetd_available => true }
end
end
end
it_configures 'swift::storage::all'
if facts[:osfamily] == 'Debian'

16
spec/classes/swift_storage_spec.rb
View File

@@ -15,10 +15,9 @@ describe 'swift::storage' do
end
it { is_expected.to contain_class('rsync::server').with(
{:use_xinetd => true,
:use_xinetd => platform_params[:xinetd_available],
:address => params[:storage_local_net_ip],
:use_chroot => 'no'
}
)}
end
@@ -62,6 +61,19 @@ describe 'swift::storage' do
facts.merge(OSDefaults.get_facts())
end
let (:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :xinetd_available => true }
when 'RedHat'
if facts[:operatingsystemmajrelease] > '8'
{ :xinetd_available => false }
else
{ :xinetd_available => true }
end
end
end
it_configures 'swift::storage'
end
end