From 8c409b4fa29861ee073a7eb3e50fe60e6afe7a32 Mon Sep 17 00:00:00 2001 From: Johan van den Dorpe Date: Mon, 11 Mar 2013 16:29:43 +0000 Subject: refactor tests to reduce duplication --- spec/classes/rsyslog_server_spec.rb | 43 ++++++++++++++----------------------- 1 file changed, 16 insertions(+), 27 deletions(-) (limited to 'spec') diff --git a/spec/classes/rsyslog_server_spec.rb b/spec/classes/rsyslog_server_spec.rb index 4f8bb62..9b9fd2b 100644 --- a/spec/classes/rsyslog_server_spec.rb +++ b/spec/classes/rsyslog_server_spec.rb @@ -1,37 +1,25 @@ require 'spec_helper' describe 'rsyslog::server', :type => :class do - context "osfamily = RedHat" do - let :facts do - { - :osfamily => 'RedHat', - } - end - - context "default usage (osfamily = RedHat)" do - let(:title) { 'rsyslog-server-basic' } - it 'should compile' do - should contain_file('/etc/rsyslog.d/server.conf') + ['RedHat', 'Debian'].each do |osfamily| + context "osfamily = #{osfamily}" do + let :facts do + { + :osfamily => osfamily, + } end - end - end - context "osfamily = Debian" do - let :facts do - { - :osfamily => 'Debian', - } - end + context "default usage (osfamily = #{osfamily})" do + let(:title) { 'rsyslog-server-basic' } - context "default usage (osfamily = Debian)" do - let(:title) { 'rsyslog-server-basic' } + it 'should compile' do + should contain_file('/etc/rsyslog.d/server.conf') + end - it 'should compile' do - should contain_file('/etc/rsyslog.d/server.conf') - end - end - end + end + end + end context "osfamily = FreeBSD" do let :facts do @@ -48,4 +36,5 @@ describe 'rsyslog::server', :type => :class do end end end -end + +end # describe 'rsyslog::server' -- cgit v1.2.3 From 9c7fe0eeb2870b29805ac508608f86c16b291e5d Mon Sep 17 00:00:00 2001 From: Johan van den Dorpe Date: Mon, 11 Mar 2013 16:48:24 +0000 Subject: Update tests to check content of server.conf --- spec/classes/rsyslog_server_spec.rb | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) (limited to 'spec') diff --git a/spec/classes/rsyslog_server_spec.rb b/spec/classes/rsyslog_server_spec.rb index 9b9fd2b..af45338 100644 --- a/spec/classes/rsyslog_server_spec.rb +++ b/spec/classes/rsyslog_server_spec.rb @@ -12,14 +12,26 @@ describe 'rsyslog::server', :type => :class do context "default usage (osfamily = #{osfamily})" do let(:title) { 'rsyslog-server-basic' } + + it 'should compile' do + should contain_file('/etc/rsyslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/auth.log/) + should contain_file('/etc/rsyslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/messages/) + end + end + context "enable_onefile (osfamily = #{osfamily})" do + let(:title) { 'rsyslog-server-onefile' } + let(:params) { {'enable_onefile' => 'true'} } + it 'should compile' do - should contain_file('/etc/rsyslog.d/server.conf') + should_not contain_file('/etc/rsyslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/auth.log/) + should contain_file('/etc/rsyslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/messages/) end + end + + end + end - end - end - end context "osfamily = FreeBSD" do let :facts do @@ -28,13 +40,25 @@ describe 'rsyslog::server', :type => :class do } end - context "default usage (osfamily = Debian)" do + context "default usage (osfamily = FreeBSD)" do let(:title) { 'rsyslog-server-basic' } it 'should compile' do - should contain_file('/etc/syslog.d/server.conf') + should contain_file('/etc/syslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/auth.log/) + should contain_file('/etc/syslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/messages/) + end + end + + context "enable_onefile (osfamily = FreeBSD)" do + let(:title) { 'rsyslog-server-onefile' } + let(:params) { {'enable_onefile' => 'true'} } + + it 'should compile' do + should_not contain_file('/etc/syslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/auth.log/) + should contain_file('/etc/syslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/messages/) end end + end end # describe 'rsyslog::server' -- cgit v1.2.3 From bdee10e4e43a20f025ab6722db34542f47504114 Mon Sep 17 00:00:00 2001 From: Johan van den Dorpe Date: Mon, 11 Mar 2013 22:07:46 +0000 Subject: Add server-hostname template and tests --- spec/classes/rsyslog_server_spec.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'spec') diff --git a/spec/classes/rsyslog_server_spec.rb b/spec/classes/rsyslog_server_spec.rb index af45338..ec2b523 100644 --- a/spec/classes/rsyslog_server_spec.rb +++ b/spec/classes/rsyslog_server_spec.rb @@ -29,6 +29,16 @@ describe 'rsyslog::server', :type => :class do end end + context "hostname_template (osfamily = #{osfamily})" do + let(:title) { 'rsyslog-server-onefile' } + let(:params) { {'custom_config' => 'rsyslog/server-hostname.conf.erb'} } + + it 'should compile' do + should contain_file('/etc/rsyslog.d/server.conf').with_content(/%hostname%\/auth.log/) + should contain_file('/etc/rsyslog.d/server.conf').with_content(/%hostname%\/messages/) + end + end + end end @@ -59,6 +69,16 @@ describe 'rsyslog::server', :type => :class do end end + context "hostname_template (osfamily = FreeBSD)" do + let(:title) { 'rsyslog-server-onefile' } + let(:params) { {'custom_config' => 'rsyslog/server-hostname.conf.erb'} } + + it 'should compile' do + should contain_file('/etc/syslog.d/server.conf').with_content(/%hostname%\/auth.log/) + should contain_file('/etc/syslog.d/server.conf').with_content(/%hostname%\/messages/) + end + end + end end # describe 'rsyslog::server' -- cgit v1.2.3