Merge pull request #97 from bodepd/fix_spec_failures

fix failing tests
This commit is contained in:
Dan Bode 2013-03-21 23:16:28 -07:00
commit 2510adebc4
2 changed files with 2 additions and 3 deletions

View File

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

View File

@ -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