Mercurial > repos > other > Puppet

comparison modules/apache/spec/acceptance/prefork_worker_spec.rb @ 36:37675581a273 puppet-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update Puppet module for Apache (pulls in concat module)
author IBBoard <dev@ibboard.co.uk>
date Sat, 14 Mar 2015 20:07:04 +0000
parents 956e484adc12
children 675c1cc61eaf
comparison
equal deleted inserted replaced
35:1bb941522ebf 36:37675581a273
4 when 'RedHat' 4 when 'RedHat'
5 servicename = 'httpd' 5 servicename = 'httpd'
6 when 'Debian' 6 when 'Debian'
7 servicename = 'apache2' 7 servicename = 'apache2'
8 when 'FreeBSD' 8 when 'FreeBSD'
9 servicename = 'apache22' 9 servicename = 'apache24'
10 end 10 end
11 11
12 case fact('osfamily') 12 case fact('osfamily')
13 when 'FreeBSD' 13 when 'FreeBSD'
14 describe 'apache::mod::event class' do 14 describe 'apache::mod::event class' do
26 expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero 26 expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
27 end 27 end
28 end 28 end
29 29
30 describe service(servicename) do 30 describe service(servicename) do
31 it { should be_running } 31 it { is_expected.to be_running }
32 it { should be_enabled } 32 it { is_expected.to be_enabled }
33 end 33 end
34 end 34 end
35 end 35 end
36 36
37 describe 'apache::mod::worker class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do 37 describe 'apache::mod::worker class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
49 expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero 49 expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
50 end 50 end
51 end 51 end
52 52
53 describe service(servicename) do 53 describe service(servicename) do
54 it { should be_running } 54 it { is_expected.to be_running }
55 it { should be_enabled } 55 it { is_expected.to be_enabled }
56 end 56 end
57 end 57 end
58 58
59 describe 'apache::mod::prefork class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do 59 describe 'apache::mod::prefork class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
60 describe 'running puppet code' do 60 describe 'running puppet code' do
71 expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero 71 expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
72 end 72 end
73 end 73 end
74 74
75 describe service(servicename) do 75 describe service(servicename) do
76 it { should be_running } 76 it { is_expected.to be_running }
77 it { should be_enabled } 77 it { is_expected.to be_enabled }
78 end 78 end
79 end 79 end