Skip to content

Commit 87aad93

Browse files
committed
Remove code from no longer supported distributions
1 parent 6295c99 commit 87aad93

File tree

3 files changed

+0
-36
lines changed

3 files changed

+0
-36
lines changed

spec/acceptance/php_spec.rb

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
packagename = 'php7.2-fpm'
1515
when %r{ubuntu-16.04}
1616
packagename = 'php7.0-fpm'
17-
when %r{ubuntu-14.04}
18-
packagename = 'php5-fpm'
1917
when %r{el}
2018
packagename = 'php-fpm'
2119
when %r{debian-8}
@@ -65,26 +63,6 @@
6563
apply_manifest(pp, catch_failures: true)
6664
apply_manifest(pp, catch_changes: true)
6765
end
68-
when %r{ubuntu-14.04}
69-
it 'works with defaults' do
70-
pp = <<-EOS
71-
class{'php':
72-
extensions => {
73-
'mysql' => {},
74-
'gd' => {},
75-
'net-url' => {
76-
package_prefix => 'php-',
77-
settings => {
78-
extension => undef
79-
},
80-
}
81-
}
82-
}
83-
EOS
84-
# Run it twice and test for idempotency
85-
apply_manifest(pp, catch_failures: true)
86-
apply_manifest(pp, catch_changes: true)
87-
end
8866
else
8967
it 'works with defaults' do
9068
pp = <<-EOS
@@ -106,8 +84,6 @@
10684
packagename = 'php7.2-fpm'
10785
when %r{ubuntu-16.04}
10886
packagename = 'php7.0-fpm'
109-
when %r{ubuntu-14.04}
110-
packagename = 'php5-fpm'
11187
when %r{el}
11288
packagename = 'php-fpm'
11389
when %r{debian-8}

spec/classes/php_fpm_service_spec.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
case facts[:osfamily]
1515
when 'Debian'
1616
case facts[:operatingsystemrelease]
17-
when '12.04'
18-
it { is_expected.to contain_service('php5-fpm').with_ensure('running').without_restart }
19-
when '14.04'
20-
it { is_expected.to contain_service('php5-fpm').with_restart('service php5-fpm reload').with_ensure('running') }
2117
when '16.04'
2218
it { is_expected.to contain_service('php7.0-fpm').with_ensure('running') }
2319
end

spec/classes/php_fpm_spec.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@
1313
case facts[:osfamily]
1414
when 'Debian'
1515
case facts[:operatingsystemrelease]
16-
when '14.04'
17-
it { is_expected.to contain_file('/etc/init/php5-fpm.override').with_content('reload signal USR2') }
18-
it { is_expected.to contain_package('php5-fpm').with_ensure('present') }
19-
it { is_expected.to contain_service('php5-fpm').with_ensure('running') }
20-
when '12.02'
21-
it { is_expected.to contain_file('/etc/init/php5-fpm.override').with_content("reload signal USR2\nmanual") }
22-
it { is_expected.to contain_package('php5-fpm').with_ensure('present') }
23-
it { is_expected.to contain_service('php5-fpm').with_ensure('running') }
2416
when '16.04'
2517
it { is_expected.to contain_package('php7.0-fpm').with_ensure('present') }
2618
it { is_expected.to contain_service('php7.0-fpm').with_ensure('running') }

0 commit comments

Comments
 (0)