Skip to content

Commit 231849c

Browse files
committed
(CAT-2360) Remove all spec tests related to RHEL7/Debian 10
RHEL 7/Debian 10 is no longer supported by facterdb Debian 10 was the only version suporting mod auth_kerb
1 parent 6cb8538 commit 231849c

File tree

10 files changed

+14
-73
lines changed

10 files changed

+14
-73
lines changed

spec/classes/mod/alias_spec.rb

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@
1313
it { is_expected.to contain_file('alias.conf').with(content: %r{Alias /icons/ "/usr/share/apache2/icons/"}) }
1414
end
1515

16-
context 'on a RedHat 7-based OS', :compile do
17-
include_examples 'RedHat 7'
18-
19-
it { is_expected.to contain_apache__mod('alias') }
20-
it { is_expected.to contain_file('alias.conf').with(content: %r{Alias /icons/ "/usr/share/httpd/icons/"}) }
21-
end
22-
2316
context 'on a RedHat 8-based OS', :compile do
2417
include_examples 'RedHat 8'
2518

@@ -37,7 +30,7 @@
3730
}
3831
end
3932

40-
include_examples 'RedHat 7'
33+
include_examples 'RedHat 8'
4134

4235
it { is_expected.to contain_apache__mod('alias') }
4336
it { is_expected.to contain_file('alias.conf').with(content: %r{Options foo}) }
@@ -53,7 +46,7 @@
5346
}
5447
end
5548

56-
include_examples 'RedHat 7'
49+
include_examples 'RedHat 8'
5750

5851
it { is_expected.to contain_apache__mod('alias') }
5952
it { is_expected.to contain_file('alias.conf').with(content: %r{Alias /apache-icons/ "/usr/share/httpd/icons/"}) }
@@ -69,7 +62,7 @@
6962
}
7063
end
7164

72-
include_examples 'RedHat 7'
65+
include_examples 'RedHat 8'
7366

7467
it { is_expected.to contain_apache__mod('alias') }
7568
it { is_expected.not_to contain_file('alias.conf') }

spec/classes/mod/auth_kerb_spec.rb

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66
it_behaves_like 'a mod class, without including apache'
77

88
context 'default configuration with parameters' do
9-
context 'on a Debian OS', :compile do
10-
include_examples 'Debian 10'
11-
12-
it { is_expected.to contain_class('apache::params') }
13-
it { is_expected.to contain_class('apache::mod::authn_core') }
14-
it { is_expected.to contain_apache__mod('auth_kerb') }
15-
it { is_expected.to contain_package('libapache2-mod-auth-kerb') }
16-
end
17-
189
context 'on a RedHat OS', :compile do
1910
include_examples 'RedHat 8'
2011

spec/classes/mod/auth_openidc_spec.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,6 @@
1616
it { is_expected.not_to contain_package('dnf-module-mod_auth_openidc') }
1717
end
1818

19-
context 'on RedHat 7', :compile do
20-
include_examples 'RedHat 7'
21-
22-
it { is_expected.to contain_class('apache::mod::authn_core') }
23-
it { is_expected.to contain_class('apache::mod::authz_user') }
24-
it { is_expected.to contain_apache__mod('auth_openidc') }
25-
it { is_expected.to contain_package('mod_auth_openidc') }
26-
it { is_expected.not_to contain_package('dnf-module-mod_auth_openidc') }
27-
end
28-
2919
context 'on RedHat 8', :compile do
3020
include_examples 'RedHat 8'
3121

spec/classes/mod/authnz_ldap_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
it { is_expected.to contain_class('apache::params') }
1212
it { is_expected.to contain_class('apache::mod::ldap') }
13-
it { is_expected.to contain_apache__mod('authnz_ldap') }
13+
it { is_expected.to contain_file('authnz_ldap.conf') }
1414

1515
context 'default verify_server_cert' do
1616
it { is_expected.to contain_file('authnz_ldap.conf').with_content(%r{^LDAPVerifyServerCert On$}) }
@@ -34,6 +34,7 @@
3434
context 'default configuration with parameters on a RedHat OS' do
3535
on_supported_os.each do |os, os_facts|
3636
next unless os.start_with?('redhat')
37+
next if os.start_with?('redhat')
3738

3839
context "On #{os}" do
3940
let :facts do

spec/classes/mod/cluster_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
require 'spec_helper'
44

55
describe 'apache::mod::cluster', type: :class do
6-
context 'on a RedHat OS Release 7 with mod version = 1.3.0' do
7-
include_examples 'RedHat 7'
6+
context 'on a RedHat OS Release 8 with mod version = 1.3.0' do
7+
include_examples 'RedHat 8'
88

99
let(:params) do
1010
{
@@ -26,8 +26,8 @@
2626
it { is_expected.to contain_file('cluster.conf') }
2727
end
2828

29-
context 'on a RedHat OS Release 7 with mod version > 1.3.0' do
30-
include_examples 'RedHat 7'
29+
context 'on a RedHat OS Release 8 with mod version > 1.3.0' do
30+
include_examples 'RedHat 8'
3131

3232
let(:params) do
3333
{

spec/classes/mod/expires_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323
end
2424

25-
include_examples 'RedHat 7'
25+
include_examples 'RedHat 8'
2626

2727
it { is_expected.to contain_apache__mod('expires') }
2828

@@ -47,7 +47,7 @@
4747
}
4848
end
4949

50-
include_examples 'RedHat 7'
50+
include_examples 'RedHat 8'
5151

5252
it { is_expected.to contain_apache__mod('expires') }
5353

spec/classes/mod/fcgid_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
it { is_expected.to contain_package('libapache2-mod-fcgid') }
1818
end
1919

20-
context 'on RHEL7' do
21-
include_examples 'RedHat 7'
20+
context 'on RHEL8' do
21+
include_examples 'RedHat 8'
2222

2323
describe 'without parameters' do
2424
it { is_expected.to contain_class('apache::params') }

spec/classes/mod/ssl_spec.rb

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,6 @@
6060
it { is_expected.to contain_file('ssl.conf').without_content(%r{ SSLCipherSuite TLSv1.2 RSA:!EXP:!NULL:+HIGH:+MEDIUM:-LOW}) }
6161
end
6262
end
63-
64-
context '7 OS with custom directories for PR#1635' do
65-
include_examples 'RedHat 7'
66-
let :pre_condition do
67-
"class { 'apache':
68-
confd_dir => '/etc/httpd/conf.puppet.d',
69-
default_mods => false,
70-
default_vhost => false,
71-
mod_dir => '/etc/httpd/conf.modules.puppet.d',
72-
vhost_dir => '/etc/httpd/conf.puppet.d',
73-
}"
74-
end
75-
76-
it { is_expected.to contain_package('mod_ssl') }
77-
it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.puppet.d/ssl.conf') }
78-
end
7963
end
8064

8165
context 'on a Debian OS' do

spec/classes/mod/status_spec.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -167,16 +167,6 @@ def require_directives(requires)
167167
}
168168
end
169169

170-
context 'on a RedHat 7 OS' do
171-
include_examples 'RedHat 7'
172-
173-
it { is_expected.to contain_apache__mod('status') }
174-
175-
include_examples 'status_conf_spec_require', req_value, 'On', '/server-status'
176-
177-
it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.modules.d/status.conf') }
178-
end
179-
180170
context 'on a RedHat 8 OS' do
181171
include_examples 'RedHat 8'
182172

spec/spec_helper_local.rb

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@
3434
end
3535

3636
shared_context 'a mod class, without including apache' do
37-
let(:facts) { on_supported_os['debian-10-x86_64'] }
38-
end
39-
40-
shared_context 'Debian 10' do
41-
let(:facts) { on_supported_os['debian-10-x86_64'] }
37+
let(:facts) { on_supported_os['debian-11-x86_64'] }
4238
end
4339

4440
shared_context 'Debian 11' do
@@ -49,10 +45,6 @@
4945
let(:facts) { on_supported_os['ubuntu-18.04-x86_64'] }
5046
end
5147

52-
shared_context 'RedHat 7' do
53-
let(:facts) { on_supported_os['redhat-7-x86_64'] }
54-
end
55-
5648
shared_context 'RedHat 8' do
5749
let(:facts) { on_supported_os['redhat-8-x86_64'] }
5850
end

0 commit comments

Comments
 (0)