Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix be_mode and be_executable matcher to be compatible with Mac OS X v10.4.11 #127

Merged
merged 2 commits into from May 25, 2013
Merged

Fix be_mode and be_executable matcher to be compatible with Mac OS X v10.4.11 #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf359f8
Fix be_mode and be_executable matcher to be compatible with Mac OS X …
matsuo May 23, 2013
8c11740
Update be_mode and be_executable matchers to be compatible with Mac O…
matsuo May 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/serverspec/commands/darwin.rb
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ def check_file_md5checksum file, expected

def check_mode file, mode
regexp = "^#{mode}$"
"stat -f %A #{escape(file)} | grep -- #{escape(regexp)}"
"stat -f%Lp #{escape(file)} | grep -- #{escape(regexp)}"
end

def check_owner file, owner
Expand All @@ -25,7 +25,7 @@ def check_grouped file, group
end

def get_mode(file)
"stat -f %A #{escape(file)}"
"stat -f%Lp #{escape(file)}"
end

def check_access_by_user file, user, access
Expand Down
4 changes: 2 additions & 2 deletions spec/darwin/commands_spec.rb
View file
Open in desktop
Expand Up @@ -43,7 +43,7 @@

describe 'check_mode' do
subject { commands.check_mode('/etc/sudoers', 440) }
it { should eq 'stat -f %A /etc/sudoers | grep -- \\^440\\$' }
it { should eq 'stat -f%Lp /etc/sudoers | grep -- \\^440\\$' }
end

describe 'check_owner' do
Expand All @@ -58,7 +58,7 @@

describe 'get_mode' do
subject { commands.get_mode('/dev') }
it { should eq 'stat -f %A /dev' }
it { should eq 'stat -f%Lp /dev' }
end

describe 'check_access_by_user' do
Expand Down