Remove code from no longer supported distributions

voxpupuli · Apr 8, 2020 · 87aad93 · 87aad93
1 parent 6295c99
commit 87aad93
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 36 deletions.
diff --git a/spec/acceptance/php_spec.rb b/spec/acceptance/php_spec.rb
@@ -14,8 +14,6 @@
       packagename = 'php7.2-fpm'
     when %r{ubuntu-16.04}
       packagename = 'php7.0-fpm'
-    when %r{ubuntu-14.04}
-      packagename = 'php5-fpm'
     when %r{el}
       packagename = 'php-fpm'
     when %r{debian-8}
@@ -65,26 +63,6 @@
         apply_manifest(pp, catch_failures: true)
         apply_manifest(pp, catch_changes: true)
       end
-    when %r{ubuntu-14.04}
-      it 'works with defaults' do
-        pp = <<-EOS
-        class{'php':
-          extensions => {
-            'mysql'    => {},
-            'gd'       => {},
-            'net-url'  => {
-              package_prefix => 'php-',
-              settings       => {
-                extension => undef
-              },
-            }
-          }
-        }
-        EOS
-        # Run it twice and test for idempotency
-        apply_manifest(pp, catch_failures: true)
-        apply_manifest(pp, catch_changes: true)
-      end
     else
       it 'works with defaults' do
         pp = <<-EOS
@@ -106,8 +84,6 @@
       packagename = 'php7.2-fpm'
     when %r{ubuntu-16.04}
       packagename = 'php7.0-fpm'
-    when %r{ubuntu-14.04}
-      packagename = 'php5-fpm'
     when %r{el}
       packagename = 'php-fpm'
     when %r{debian-8}

diff --git a/spec/classes/php_fpm_service_spec.rb b/spec/classes/php_fpm_service_spec.rb
@@ -14,10 +14,6 @@
         case facts[:osfamily]
         when 'Debian'
           case facts[:operatingsystemrelease]
-          when '12.04'
-            it { is_expected.to contain_service('php5-fpm').with_ensure('running').without_restart }
-          when '14.04'
-            it { is_expected.to contain_service('php5-fpm').with_restart('service php5-fpm reload').with_ensure('running') }
           when '16.04'
             it { is_expected.to contain_service('php7.0-fpm').with_ensure('running') }
           end

diff --git a/spec/classes/php_fpm_spec.rb b/spec/classes/php_fpm_spec.rb
@@ -13,14 +13,6 @@
         case facts[:osfamily]
         when 'Debian'
           case facts[:operatingsystemrelease]
-          when '14.04'
-            it { is_expected.to contain_file('/etc/init/php5-fpm.override').with_content('reload signal USR2') }
-            it { is_expected.to contain_package('php5-fpm').with_ensure('present') }
-            it { is_expected.to contain_service('php5-fpm').with_ensure('running') }
-          when '12.02'
-            it { is_expected.to contain_file('/etc/init/php5-fpm.override').with_content("reload signal USR2\nmanual") }
-            it { is_expected.to contain_package('php5-fpm').with_ensure('present') }
-            it { is_expected.to contain_service('php5-fpm').with_ensure('running') }
           when '16.04'
             it { is_expected.to contain_package('php7.0-fpm').with_ensure('present') }
             it { is_expected.to contain_service('php7.0-fpm').with_ensure('running') }