opuppet/module-concat
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove all the eq() checks as this breaks in PE3.3.

Browse source
This commit is contained in:
Ashley Penney 2014-06-02 16:10:29 -04:00
parent 03cee3f116
commit f66ca3c1b7
9 changed files with 40 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
spec/acceptance/backup_spec.rb
View file

@ -22,10 +22,9 @@ describe 'concat backup parameter', :unless => UNSUPPORTED_PLATFORMS.include?(fa
it 'applies the manifest twice with "Filebucketed" stdout and no stderr' do it 'applies the manifest twice with "Filebucketed" stdout and no stderr' do
apply_manifest(pp, :catch_failures => true) do |r| apply_manifest(pp, :catch_failures => true) do |r|
expect(r.stderr).to eq("")
expect(r.stdout).to match(/Filebucketed #{basedir}\/file to puppet with sum 0140c31db86293a1a1e080ce9b91305f/) # sum is for file contents of 'old contents' expect(r.stdout).to match(/Filebucketed #{basedir}\/file to puppet with sum 0140c31db86293a1a1e080ce9b91305f/) # sum is for file contents of 'old contents'
end end
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/file") do describe file("#{basedir}/file") do
@ -55,8 +54,8 @@ describe 'concat backup parameter', :unless => UNSUPPORTED_PLATFORMS.include?(fa
# XXX Puppet doesn't mention anything about filebucketing with a given # XXX Puppet doesn't mention anything about filebucketing with a given
# extension like .backup # extension like .backup
it 'applies the manifest twice no stderr' do it 'applies the manifest twice no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/file") do describe file("#{basedir}/file") do
@ -91,10 +90,9 @@ describe 'concat backup parameter', :unless => UNSUPPORTED_PLATFORMS.include?(fa
it 'applies the manifest twice with no "Filebucketed" stdout and no stderr' do it 'applies the manifest twice with no "Filebucketed" stdout and no stderr' do
apply_manifest(pp, :catch_failures => true) do |r| apply_manifest(pp, :catch_failures => true) do |r|
expect(r.stderr).to eq("")
expect(r.stdout).to_not match(/Filebucketed/) expect(r.stdout).to_not match(/Filebucketed/)
end end
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/file") do describe file("#{basedir}/file") do

4
spec/acceptance/concat_spec.rb
View file

@ -17,8 +17,8 @@ describe 'basic concat test', :unless => UNSUPPORTED_PLATFORMS.include?(fact('os
shared_examples 'successfully_applied' do |pp| shared_examples 'successfully_applied' do |pp|
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
end end

4
spec/acceptance/empty_spec.rb
View file

@ -12,8 +12,8 @@ describe 'concat force empty parameter', :unless => UNSUPPORTED_PLATFORMS.includ
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/file") do describe file("#{basedir}/file") do

8
spec/acceptance/fragment_source_spec.rb
View file

@ -39,8 +39,8 @@ describe 'concat::fragment source', :unless => UNSUPPORTED_PLATFORMS.include?(fa
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/foo") do describe file("#{basedir}/foo") do
@ -95,8 +95,8 @@ describe 'concat::fragment source', :unless => UNSUPPORTED_PLATFORMS.include?(fa
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/result_file1") do describe file("#{basedir}/result_file1") do
it { should be_file } it { should be_file }

32
spec/acceptance/newline_spec.rb
View file

@ -19,8 +19,8 @@ describe 'concat ensure_newline parameter', :unless => UNSUPPORTED_PLATFORMS.inc
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/file") do describe file("#{basedir}/file") do
@ -29,32 +29,4 @@ describe 'concat ensure_newline parameter', :unless => UNSUPPORTED_PLATFORMS.inc
end end
end end
#context '=> true' do
# pp = <<-EOS
# include concat::setup
# concat { '#{basedir}/file':
# ensure_newline => true,
# }
# concat::fragment { '1':
# target => '#{basedir}/file',
# content => '1',
# }
# concat::fragment { '2':
# target => '#{basedir}/file',
# content => '2',
# }
# EOS
# it 'applies the manifest twice with no stderr' do
# expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
# expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
# #XXX ensure_newline => true causes changes on every run because the files
# #are modified in place.
# end
# describe file("#{basedir}/file") do
# it { should be_file }
# it { should contain "1\n2\n" }
# end
#end
end end

16
spec/acceptance/order_spec.rb
View file

@ -28,8 +28,8 @@ describe 'concat order', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamil
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/foo") do describe file("#{basedir}/foo") do
@ -62,8 +62,8 @@ describe 'concat order', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamil
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/foo") do describe file("#{basedir}/foo") do
@ -105,8 +105,8 @@ describe 'concat::fragment order', :unless => UNSUPPORTED_PLATFORMS.include?(fac
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/foo") do describe file("#{basedir}/foo") do
@ -140,8 +140,8 @@ describe 'concat::fragment order', :unless => UNSUPPORTED_PLATFORMS.include?(fac
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/foo") do describe file("#{basedir}/foo") do

20
spec/acceptance/replace_spec.rb
View file

@ -30,8 +30,8 @@ describe 'replacement of', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfam
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/file") do describe file("#{basedir}/file") do
@ -69,8 +69,8 @@ describe 'replacement of', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfam
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/file") do describe file("#{basedir}/file") do
@ -113,8 +113,8 @@ describe 'replacement of', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfam
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
# XXX specinfra doesn't support be_linked_to on AIX # XXX specinfra doesn't support be_linked_to on AIX
@ -159,8 +159,8 @@ describe 'replacement of', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfam
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/file") do describe file("#{basedir}/file") do
@ -236,8 +236,8 @@ describe 'replacement of', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfam
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/file") do describe file("#{basedir}/file") do

4
spec/acceptance/symbolic_name_spec.rb
View file

@ -22,8 +22,8 @@ describe 'symbolic name', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfami
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/file") do describe file("#{basedir}/file") do

12
spec/acceptance/warn_spec.rb
View file

@ -23,8 +23,8 @@ describe 'concat warn =>', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfam
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/file") do describe file("#{basedir}/file") do
@ -55,8 +55,8 @@ describe 'concat warn =>', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfam
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/file") do describe file("#{basedir}/file") do
@ -87,8 +87,8 @@ describe 'concat warn =>', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfam
EOS EOS
it 'applies the manifest twice with no stderr' do it 'applies the manifest twice with no stderr' do
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("") apply_manifest(pp, :catch_failures => true)
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("") apply_manifest(pp, :catch_changes => true)
end end
describe file("#{basedir}/file") do describe file("#{basedir}/file") do