diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 15:17:48 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 15:17:48 -0700 |
commit | 60afdeda17f9672405d9f425fcc1b08f61f9adda (patch) | |
tree | 2f36806174ae5c791ed5453fd2bcbaf55993f417 | |
parent | 46401caef6e00708867d09319985528c39636ba2 (diff) | |
parent | 61891bbe6112b580043e9d8c256f722a6add9492 (diff) |
Merge branch 'maint/2.2.x/range_spec_tests' into 2.2.x
* maint/2.2.x/range_spec_tests:
(#13494) Specify the behavior of zero padded strings
-rw-r--r-- | lib/puppet/parser/functions/range.rb | 9 | ||||
-rw-r--r-- | spec/unit/puppet/parser/functions/range_spec.rb | 19 |
2 files changed, 23 insertions, 5 deletions
diff --git a/lib/puppet/parser/functions/range.rb b/lib/puppet/parser/functions/range.rb index 6e85422..825617b 100644 --- a/lib/puppet/parser/functions/range.rb +++ b/lib/puppet/parser/functions/range.rb @@ -15,9 +15,18 @@ an array. Will return: [0,1,2,3,4,5,6,7,8,9] + range("00", "09") + +Will return: [0,1,2,3,4,5,6,7,8,9] (Zero padded strings are converted to +integers automatically) + range("a", "c") Will return: ["a","b","c"] + + range("host01", "host10") + +Will return: ["host01", "host02", ..., "host09", "host10"] EOS ) do |arguments| diff --git a/spec/unit/puppet/parser/functions/range_spec.rb b/spec/unit/puppet/parser/functions/range_spec.rb index 8c2446a..060423a 100644 --- a/spec/unit/puppet/parser/functions/range_spec.rb +++ b/spec/unit/puppet/parser/functions/range_spec.rb @@ -6,8 +6,8 @@ describe "the range function" do Puppet::Parser::Functions.autoloader.loadall end - before :each do - @scope = Puppet::Parser::Scope.new + let :scope do + Puppet::Parser::Scope.new end it "should exist" do @@ -15,17 +15,26 @@ describe "the range function" do end it "should raise a ParseError if there is less than 1 arguments" do - lambda { @scope.function_range([]) }.should( raise_error(Puppet::ParseError)) + lambda { scope.function_range([]) }.should( raise_error(Puppet::ParseError)) end it "should return a letter range" do - result = @scope.function_range(["a","d"]) + result = scope.function_range(["a","d"]) result.should(eq(['a','b','c','d'])) end it "should return a number range" do - result = @scope.function_range(["1","4"]) + result = scope.function_range(["1","4"]) result.should(eq([1,2,3,4])) end + it "should work with padded hostname like strings" do + expected = ("host01".."host10").to_a + scope.function_range(["host01","host10"]).should eq expected + end + + it "should coerce zero padded digits to integers" do + expected = (0..10).to_a + scope.function_range(["00", "10"]).should eq expected + end end |