summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2017-06-11 19:55:40 +0200
committerColleen Murphy <colleen@gazlene.net>2017-06-11 19:56:51 +0200
commit6325c13cf76b6292b830699d2ae28dfd260bead1 (patch)
treec814d9dfc9ee1bc7e11685c5873dc6cb8130ddee
parent17543eceafa1cc132681e860555e9c4e423cc893 (diff)
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
Notes
Notes (review): Code-Review+2: Ian Wienand <iwienand@redhat.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 13 Jun 2017 22:16:03 +0000 Reviewed-on: https://review.openstack.org/473118 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
-rw-r--r--spec/acceptance/basic_spec.rb74
1 files changed, 0 insertions, 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
24 apply_manifest(default_puppet_module, catch_changes: true) 24 apply_manifest(default_puppet_module, catch_changes: true)
25 end 25 end
26 26
27 describe 'required files' do
28 describe 'RedHat files', :if => ['fedora', 'redhat'].include?(os[:family]) do
29 describe file('/etc/httpd/conf.d/') do
30 it { should be_directory }
31 end
32
33 describe file('/etc/httpd/conf.d/50-localhost.conf') do
34 it { should be_file }
35 it { should be_owned_by 'root' }
36 it { should be_grouped_into 'root' }
37 its(:content) { should include '<VirtualHost *:80>' }
38 end
39 end
40
41 describe 'Debian files', :if => ['debian', 'ubuntu'].include?(os[:family]) do
42 describe file('/etc/apache2/sites-enabled/') do
43 it { should be_directory }
44 end
45
46 describe file('/etc/apache2/sites-enabled/50-localhost.conf') do
47 it { should be_file }
48 it { should be_owned_by 'root' }
49 it { should be_grouped_into 'root' }
50 its(:content) { should include '<VirtualHost *:80>' }
51 end
52
53 describe file('/etc/apache2/mods-enabled/python.load') do
54 it { should be_linked_to '../mods-available/python.load' }
55 end
56
57 describe file('/etc/apache2/mods-enabled/ssl.load') do
58 it { should be_linked_to '../mods-available/ssl.load' }
59 end
60
61 describe file('/etc/apache2/mods-enabled/rewrite.load') do
62 it { should be_linked_to '../mods-available/rewrite.load' }
63 end
64 end
65 end
66
67 describe 'required packages' do
68 describe 'RedHat packages', :if => ['fedora', 'redhat'].include?(os[:family]) do
69 required_packages = [
70 package('httpd'),
71 package('httpd-devel'),
72 package('php'),
73 package('mod_ssl'),
74 ]
75
76 required_packages.each do |package|
77 describe package do
78 it { should be_installed }
79 end
80 end
81 end
82
83 describe 'Debian packages', :if => ['debian', 'ubuntu'].include?(os[:family]) do
84 required_packages = [
85 package('apache2'),
86 package('apache2-dev'),
87 package('libaprutil1-dev'),
88 package('libapr1-dev'),
89 package('libapache2-mod-php7.0'),
90 package('libapache2-mod-python'),
91 ]
92
93 required_packages.each do |package|
94 describe package do
95 it { should be_installed }
96 end
97 end
98 end
99 end
100
101 describe 'required services' do 27 describe 'required services' do
102 describe service('httpd'), :if => ['fedora', 'redhat'].include?(os[:family]) do 28 describe service('httpd'), :if => ['fedora', 'redhat'].include?(os[:family]) do
103 it { should be_enabled } 29 it { should be_enabled }