From 6325c13cf76b6292b830699d2ae28dfd260bead1 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Sun, 11 Jun 2017 19:55:40 +0200 Subject: [PATCH] Remove unnecessary beaker tests It is not necessary to check every file and package in the puppet functional tests. It can be assumed that if puppet finished corretly then it was also able to successfully find and install packages and apply configs. We leave the service checks, however, because it is possible for services to die due to misconfiguration after puppet starts them. Change-Id: I97682cb9d956803c3ab1be42fe44c0437c3d5f02 --- spec/acceptance/basic_spec.rb | 74 ----------------------------------- 1 file changed, 74 deletions(-) diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb index bcc6991..9e826f1 100644 --- a/spec/acceptance/basic_spec.rb +++ b/spec/acceptance/basic_spec.rb @@ -24,80 +24,6 @@ describe 'puppet-httpd module' do apply_manifest(default_puppet_module, catch_changes: true) end - describe 'required files' do - describe 'RedHat files', :if => ['fedora', 'redhat'].include?(os[:family]) do - describe file('/etc/httpd/conf.d/') do - it { should be_directory } - end - - describe file('/etc/httpd/conf.d/50-localhost.conf') do - it { should be_file } - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - its(:content) { should include '' } - end - end - - describe 'Debian files', :if => ['debian', 'ubuntu'].include?(os[:family]) do - describe file('/etc/apache2/sites-enabled/') do - it { should be_directory } - end - - describe file('/etc/apache2/sites-enabled/50-localhost.conf') do - it { should be_file } - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - its(:content) { should include '' } - end - - describe file('/etc/apache2/mods-enabled/python.load') do - it { should be_linked_to '../mods-available/python.load' } - end - - describe file('/etc/apache2/mods-enabled/ssl.load') do - it { should be_linked_to '../mods-available/ssl.load' } - end - - describe file('/etc/apache2/mods-enabled/rewrite.load') do - it { should be_linked_to '../mods-available/rewrite.load' } - end - end - end - - describe 'required packages' do - describe 'RedHat packages', :if => ['fedora', 'redhat'].include?(os[:family]) do - required_packages = [ - package('httpd'), - package('httpd-devel'), - package('php'), - package('mod_ssl'), - ] - - required_packages.each do |package| - describe package do - it { should be_installed } - end - end - end - - describe 'Debian packages', :if => ['debian', 'ubuntu'].include?(os[:family]) do - required_packages = [ - package('apache2'), - package('apache2-dev'), - package('libaprutil1-dev'), - package('libapr1-dev'), - package('libapache2-mod-php7.0'), - package('libapache2-mod-python'), - ] - - required_packages.each do |package| - describe package do - it { should be_installed } - end - end - end - end - describe 'required services' do describe service('httpd'), :if => ['fedora', 'redhat'].include?(os[:family]) do it { should be_enabled }