openstack/puppet-swift
Code Issues Proposed changes

Remove redundant user ownership declaration and ensure spec test coherency

Browse Source 
swift is already set as a owner for File[] resources. This is a
simple cleanup that removes a redundant user declaration. The spec
tests did not verify that default File[] values were applied to
/var/lib/swift.

Change-Id: I608ef39ca8bbf78ca8029a65979db659184baa3f
This commit is contained in:
David Moreau Simard 2014-01-08 17:39:53 -05:00
parent 12131aa3a8
commit 449fd78f48
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/init.pp
View File

@ -57,7 +57,6 @@ class swift(
} }
file { '/var/lib/swift': file { '/var/lib/swift':
ensure => directory, ensure => directory,
owner => 'swift'
} }
file { '/var/run/swift': file { '/var/run/swift':
ensure => directory, ensure => directory,

6
spec/classes/swift_spec.rb
View File

@ -31,6 +31,7 @@ describe 'swift' do
:require => 'Package[swift]' :require => 'Package[swift]'
} }
end end
it {should contain_user('swift')}
it {should contain_file('/home/swift').with( it {should contain_file('/home/swift').with(
{:ensure => 'directory', :mode => '0700' {:ensure => 'directory', :mode => '0700'
}.merge(file_defaults) }.merge(file_defaults)
@ -42,6 +43,9 @@ describe 'swift' do
it {should contain_file('/var/run/swift').with( it {should contain_file('/var/run/swift').with(
{:ensure => 'directory'}.merge(file_defaults) {:ensure => 'directory'}.merge(file_defaults)
)} )}
it {should contain_file('/var/lib/swift').with(
{:ensure => 'directory'}.merge(file_defaults)
)}
it {should contain_file('/etc/swift/swift.conf').with( it {should contain_file('/etc/swift/swift.conf').with(
{:ensure => 'present', {:ensure => 'present',
:mode => '0660', :mode => '0660',
@ -52,8 +56,6 @@ describe 'swift' do
'swift-hash/swift_hash_path_suffix').with_value('string') 'swift-hash/swift_hash_path_suffix').with_value('string')
end end
it {should contain_package('swift').with_ensure('present')} it {should contain_package('swift').with_ensure('present')}
it {should contain_user('swift')}
it {should contain_file('/var/lib/swift').with_ensure('directory')}
end end
describe 'when overriding package_ensure parameter' do describe 'when overriding package_ensure parameter' do