diff options
| author | Adam Edwards <adamed@opscode.com> | 2014-04-01 14:56:24 -0700 |
|---|---|---|
| committer | Adam Edwards <adamed@opscode.com> | 2014-04-01 14:56:24 -0700 |
| commit | 97db7b578d026a1dddd960417e1676da33355f80 (patch) | |
| tree | 918ae1e550d250911c54ba54e12524317104b698 | |
| parent | 6fc39b300e98ebc55a40850eafac9c4b592ae4d7 (diff) | |
| parent | c7bd4e2cf4449c1b8960a0f907a367aacbf531ed (diff) | |
| download | mixlib-shellout-97db7b578d026a1dddd960417e1676da33355f80.tar.gz | |
Merge pull request #44 from opscode/adamed/mixlib-6
MIXLIB-6: Fedora test break due to symlink
| -rw-r--r-- | spec/mixlib/shellout_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/mixlib/shellout_spec.rb b/spec/mixlib/shellout_spec.rb index 3be0d27..276adbf 100644 --- a/spec/mixlib/shellout_spec.rb +++ b/spec/mixlib/shellout_spec.rb @@ -344,7 +344,9 @@ describe Mixlib::ShellOut do let(:options) { { :cwd => cwd } } context 'when running under Unix', :unix_only do - let(:cwd) { '/bin' } + # Use /bin for tests only if it is not a symlink. Some + # distributions (e.g. Fedora) symlink it to /usr/bin + let(:cwd) { File.symlink?('/bin') ? '/tmp' : '/bin' } let(:cmd) { 'pwd' } it "should chdir to the working directory" do |