summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorAdrien Thebo <git@somethingsinistral.net>2013-09-18 21:48:45 -0700
committerAdrien Thebo <git@somethingsinistral.net>2013-09-18 21:48:45 -0700
commit63811b9d599bdc23ae9c69189f7940013fcae87a (patch)
treecb7d521036ec96c3389c61f8f94137467e9bc868 /spec
parent9e0d8a8e0a83e1659fdb289078fd15862dca028b (diff)
(maint) Simplify validate_cmd specs
Diffstat (limited to 'spec')
-rw-r--r--spec/unit/puppet/parser/functions/validate_cmd_spec.rb91
1 files changed, 23 insertions, 68 deletions
diff --git a/spec/unit/puppet/parser/functions/validate_cmd_spec.rb b/spec/unit/puppet/parser/functions/validate_cmd_spec.rb
index c0defbc..0aa3ba7 100644
--- a/spec/unit/puppet/parser/functions/validate_cmd_spec.rb
+++ b/spec/unit/puppet/parser/functions/validate_cmd_spec.rb
@@ -3,87 +3,42 @@ require 'spec_helper'
describe Puppet::Parser::Functions.function(:validate_cmd) do
let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
- # The subject of these examplres is the method itself.
subject do
- # This makes sure the function is loaded within each test
function_name = Puppet::Parser::Functions.function(:validate_cmd)
scope.method(function_name)
end
- context 'Using Puppet::Parser::Scope.new' do
-
- describe 'Garbage inputs' do
- inputs = [
- [ nil ],
- [ [ nil ] ],
- [ { 'foo' => 'bar' } ],
- [ { } ],
- [ '' ],
- [ "one", "one", "MSG to User", "4th arg" ],
- ]
-
- inputs.each do |input|
- it "validate_cmd(#{input.inspect}) should fail" do
- expect { subject.call [input] }.to raise_error Puppet::ParseError
- end
- end
+ describe "with an explicit failure message" do
+ it "prints the failure message on error" do
+ expect {
+ subject.call ['', '/bin/false', 'failure message!']
+ }.to raise_error Puppet::ParseError, /failure message!/
end
+ end
- describe 'Valid inputs' do
- inputs = [
- [ '/full/path/to/something', '/bin/echo' ],
- [ '/full/path/to/something', '/bin/cat' ],
- ]
-
- inputs.each do |input|
- it "validate_cmd(#{input.inspect}) should not fail" do
- expect { subject.call input }.not_to raise_error
- end
- end
+ 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/
end
- describe "Valid inputs which should raise an exception without a message" do
- # The intent here is to make sure valid inputs raise exceptions when they
- # don't specify an error message to display. This is the behvior in
- # 2.2.x and prior.
- inputs = [
- [ "hello", "/bin/false" ],
- ]
-
- inputs.each do |input|
- it "validate_cmd(#{input.inspect}) should fail" do
- expect { subject.call input }.to raise_error /validate_cmd.*?failed to validate content with command/
- end
- end
+ it "includes the command return value" do
+ expect {
+ subject.call ['', '/cant/run/this']
+ }.to raise_error Puppet::ParseError, /returned 1\b/
end
+ end
- describe "Nicer Error Messages" do
- # The intent here is to make sure the function returns the 3rd argument
- # in the exception thrown
- inputs = [
- [ "hello", [ "bye", "later", "adios" ], "MSG to User" ],
- [ "greetings", "salutations", "Error, greetings does not match salutations" ],
- ]
-
- inputs.each do |input|
- it "validate_cmd(#{input.inspect}) should fail" do
- expect { subject.call input }.to raise_error /#{input[2]}/
- end
- end
+ 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
end
- describe "Test output message" do
- it "validate_cmd('whatever', 'kthnksbye') should fail" do
- expect { subject.call ['whatever', 'kthnksbye'] }.to raise_error /kthnksbye.* returned 1/
- end
+ it "can negatively validate file content" do
+ expect {
+ subject.call ["", "/usr/bin/test -s"]
+ }.to raise_error Puppet::ParseError, /failed to validate.*test -s/
end
end
-
- it "can positively validate file content" do
- expect { subject.call ["non-empty", "/usr/bin/test -s"] }.to_not raise_error
- end
-
- it "can negatively validate file content" do
- expect { subject.call ["", "/usr/bin/test -s"] }.to raise_error Puppet::ParseError, /failed to validate.*test -s/
- end
end