openstack/puppet-swift
Code Issues Proposed changes

fix failing tests

Browse Source 
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.
This commit is contained in:
Dan Bode 2013-03-21 23:15:10 -07:00
parent 6ec85968a5
commit 0602fb5dfe
2 changed files with 2 additions and 3 deletions

1
spec/classes/swift_proxy_spec.rb

@ -53,7 +53,6 @@ describe 'swift::proxy' do
:owner => 'swift', :owner => 'swift',
:group => 'swift', :group => 'swift',
:mode => '0660', :mode => '0660',
:require => 'Package[swift-proxy]'
} }
)} )}

4
spec/defines/swift_storage_server_spec.rb

@ -80,10 +80,10 @@ describe 'swift::storage::server' do
end end
describe "when pipeline is passed an array" do describe "when pipeline is passed an array" do
let :params do req_params.merge({:pipeline => [1,2,3]}) end 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*$/, :content => /^pipeline\s*=\s*1 2 3\s*$/,
:before => ["Swift::Storage::Filter::1[#{t}]", "Swift::Storage::Filter::2[#{t}]", "Swift::Storage::Filter::3[#{t}]"] :before => ["Swift::Storage::Filter::1[#{t}]", "Swift::Storage::Filter::2[#{t}]", "Swift::Storage::Filter::3[#{t}]"]
})} )}
end end
describe "when pipeline is not passed an array" do describe "when pipeline is not passed an array" do
let :params do req_params.merge({:pipeline => 'not an array'}) end let :params do req_params.merge({:pipeline => 'not an array'}) end