It is actually all Solaris

This commit is contained in:
Hunter Haugen 2014-02-27 14:20:42 -08:00
parent 660cf98c52
commit 311adee522

View file

@ -34,7 +34,7 @@ describe 'concat order' do
describe file('/tmp/concat/foo') do
it { should be_file }
#XXX Solaris 10 doesn't support multi-line grep
it("should contain string10\nstring1\nsring2", :unless => fact('operatingsystemrelease').match(/^10_u\d+$/)) {
it("should contain string10\nstring1\nsring2", :unless => fact('osfamily') == 'Solaris') {
should contain "string10\nstring1\nsring2"
}
end
@ -68,7 +68,7 @@ describe 'concat order' do
describe file('/tmp/concat/foo') do
it { should be_file }
#XXX Solaris 10 doesn't support multi-line grep
it("should contain string1\nstring2\nsring10", :unless => fact('operatingsystemrelease').match(/^10_u\d+$/)) {
it("should contain string1\nstring2\nsring10", :unless => fact('osfamily') == 'Solaris') {
should contain "string1\nstring2\nsring10"
}
end
@ -110,7 +110,7 @@ describe 'concat::fragment order' do
describe file('/tmp/concat/foo') do
it { should be_file }
#XXX Solaris 10 doesn't support multi-line grep
it("should contain string3\nstring2\nsring1", :unless => fact('operatingsystemrelease').match(/^10_u\d+$/)) {
it("should contain string3\nstring2\nsring1", :unless => fact('osfamily') == 'Solaris') {
should contain "string3\nstring2\nsring1"
}
end
@ -145,7 +145,7 @@ describe 'concat::fragment order' do
describe file('/tmp/concat/foo') do
it { should be_file }
#XXX Solaris 10 doesn't support multi-line grep
it("should contain string1\nstring2\nsring3", :unless => fact('operatingsystemrelease').match(/^10_u\d+$/)) {
it("should contain string1\nstring2\nsring3", :unless => fact('osfamily') == 'Solaris') {
should contain "string1\nstring2\nsring3"
}
end