From 0602fb5dfec5a63bb33a3c5bc86e93bbb6042a5f Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Thu, 21 Mar 2013 23:15:10 -0700 Subject: [PATCH] fix failing tests this fixes some tests that are failing b/c of some puppet 3.x changes in the way that deps of containers propogate to the contained resources. --- spec/classes/swift_proxy_spec.rb | 1 - spec/defines/swift_storage_server_spec.rb | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spec/classes/swift_proxy_spec.rb b/spec/classes/swift_proxy_spec.rb index 77e705d8..90b5424c 100644 --- a/spec/classes/swift_proxy_spec.rb +++ b/spec/classes/swift_proxy_spec.rb @@ -53,7 +53,6 @@ describe 'swift::proxy' do :owner => 'swift', :group => 'swift', :mode => '0660', - :require => 'Package[swift-proxy]' } )} diff --git a/spec/defines/swift_storage_server_spec.rb b/spec/defines/swift_storage_server_spec.rb index ba37f383..b3d795b4 100644 --- a/spec/defines/swift_storage_server_spec.rb +++ b/spec/defines/swift_storage_server_spec.rb @@ -80,10 +80,10 @@ describe 'swift::storage::server' do end describe "when pipeline is passed an array" do let :params do req_params.merge({:pipeline => [1,2,3]}) end - it { should contain_file(fragment_file).with({ + it { should contain_concat__fragment("swift-#{t}-#{title}").with( :content => /^pipeline\s*=\s*1 2 3\s*$/, :before => ["Swift::Storage::Filter::1[#{t}]", "Swift::Storage::Filter::2[#{t}]", "Swift::Storage::Filter::3[#{t}]"] - })} + )} end describe "when pipeline is not passed an array" do let :params do req_params.merge({:pipeline => 'not an array'}) end