Merge pull request #235 from mhaskel/windows_test_fixes
This *should* make tests pass on windows
This commit is contained in:
commit
bffc8646f6
2 changed files with 2 additions and 2 deletions
|
@ -124,7 +124,7 @@ describe 'basic concat test' do
|
||||||
describe file("#{basedir}/file") do
|
describe file("#{basedir}/file") do
|
||||||
it { should be_file }
|
it { should be_file }
|
||||||
it { should be_owned_by username }
|
it { should be_owned_by username }
|
||||||
it { should be_grouped_into groupname }
|
it("should be group", :unless => (fact('osfamily') == 'windows')) { should be_grouped_into groupname }
|
||||||
it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
|
it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
|
||||||
should be_mode 644
|
should be_mode 644
|
||||||
}
|
}
|
||||||
|
|
|
@ -126,7 +126,7 @@ describe 'replacement of' do
|
||||||
end
|
end
|
||||||
|
|
||||||
# XXX specinfra doesn't support be_linked_to on AIX
|
# XXX specinfra doesn't support be_linked_to on AIX
|
||||||
describe file("#{basedir}/file"), :unless => (fact("osfamily") == "AIX") do
|
describe file("#{basedir}/file"), :unless => (fact("osfamily") == "AIX" or fact("osfamily") == "windows") do
|
||||||
it { should be_linked_to "#{basedir}/dangling" }
|
it { should be_linked_to "#{basedir}/dangling" }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue