From a1978698ef0909c0954812176316a7f28b0db986 Mon Sep 17 00:00:00 2001 From: Tomas Doran Date: Tue, 19 Nov 2013 18:42:19 +0000 Subject: Fix the tests on osx --- spec/unit/puppet/parser/functions/validate_cmd_spec.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/unit/puppet/parser/functions/validate_cmd_spec.rb b/spec/unit/puppet/parser/functions/validate_cmd_spec.rb index 0aa3ba7..a86cb01 100644 --- a/spec/unit/puppet/parser/functions/validate_cmd_spec.rb +++ b/spec/unit/puppet/parser/functions/validate_cmd_spec.rb @@ -1,5 +1,8 @@ require 'spec_helper' +TESTEXE = File.exists?('/usr/bin/test') ? '/usr/bin/test' : '/bin/test' +TOUCHEXE = File.exists?('/usr/bin/touch') ? '/usr/bin/touch' : '/bin/touch' + describe Puppet::Parser::Functions.function(:validate_cmd) do let(:scope) { PuppetlabsSpec::PuppetInternals.scope } @@ -19,8 +22,8 @@ describe Puppet::Parser::Functions.function(:validate_cmd) do describe "on validation failure" do it "includes the command error output" do expect { - subject.call ['', '/bin/touch /cant/touch/this'] - }.to raise_error Puppet::ParseError, /cannot touch/ + subject.call ['', "#{TOUCHEXE} /cant/touch/this"] + }.to raise_error Puppet::ParseError, /(cannot touch|o such file or)/ end it "includes the command return value" do @@ -32,12 +35,12 @@ describe Puppet::Parser::Functions.function(:validate_cmd) do describe "when performing actual validation" do it "can positively validate file content" do - expect { subject.call ["non-empty", "/usr/bin/test -s"] }.to_not raise_error + expect { subject.call ["non-empty", "#{TESTEXE} -s"] }.to_not raise_error end it "can negatively validate file content" do expect { - subject.call ["", "/usr/bin/test -s"] + subject.call ["", "#{TESTEXE} -s"] }.to raise_error Puppet::ParseError, /failed to validate.*test -s/ end end -- cgit v1.2.3