Skip to content

Commit

Permalink
(PUP-4749) testdir incorrectly used in calling all functions test
Browse files Browse the repository at this point in the history 
The previous version of this test incorrectly handled the testdir
variable, as it could have been set from multiple agents, when they
exist (puppet server).  This is a simple change to only have a single
agents loop, rather than having to store an array or hash of testdirs.
  • Loading branch information
Eric Thompson authored and Kylo Ginsberg committed Jun 19, 2015
1 parent 83fe870 commit d93f591
Showing 1 changed file with 70 additions and 73 deletions.
143 changes: 70 additions & 73 deletions acceptance/tests/parser_functions/calling_all_functions.rb
View file
@@ -1,10 +1,21 @@
test_name 'Calling all functions.. test in progress!'

# create single manifest calling all functions
step 'Apply manifest containing all function calls'
def manifest_call_each_function_from_array(functions)
manifest = ''
# use index to work around puppet's imutable variables
# use variables so we can contatenate strings
functions.each_with_index do |function,index|
manifest << "$pre#{index} = \"sayeth #{function[:name]}: \" $output#{index} = #{function[:name]}(#{function[:args]}) #{function[:lambda]} notice \"${pre#{index}}${output#{index}}\"\n"
end
manifest
end

# create list of 3x functions and args
# notes: hiera functions are well tested elsewhere, included for completeness
# special cases: contain (call this from call_em_all)
# do fail last because it errors out
testdir = ''
generator = ''
agents.each do |agent|
testdir = agent.tmpdir('calling_all_functions')
Expand All @@ -13,67 +24,66 @@
else
generator = {:args => '"/bin/date"', :expected => /\w\w\w.*?\d\d:\d\d\:\d\d/}
end
end

functions_3x = [
{:name => :alert, :args => '"consider yourself on alert"', :lambda => nil, :expected => 'consider yourself on alert'},
{:name => :assert_type, :args => '"String[1]", "Valar morghulis"', :lambda => nil, :expected => 'Valar morghulis'},
# this is explicitly called from call_em_all module which is included below
#{:name => :contain, :args => 'call_em_all', :lambda => nil, :expected => ''},
# below doens't instance the resource. no output
{:name => :create_resources, :args => 'notify, {"w"=>{message=>"winter is coming"}}', :lambda => nil, :expected => ''},
{:name => :crit, :args => '"consider yourself critical"', :lambda => nil, :expected => 'consider yourself critical'},
{:name => :debug, :args => '"consider yourself bugged"', :lambda => nil, :expected => ''}, # no output expected unless run with debug
{:name => :defined, :args => 'File["/tmp"]', :lambda => nil, :expected => 'false'},
{:name => :digest, :args => '"Sansa"', :lambda => nil, :expected => 'f16491bf0133c6103918b2edcd00cf89'},
{:name => :each, :args => '[1,2,3]', :lambda => '|$x| {notice $x}', :expected => '[1, 2, 3]'},
{:name => :emerg, :args => '"consider yourself emergent"', :lambda => nil, :expected => 'consider yourself emergent'},
{:name => :epp, :args => '"call_em_all/template.epp",{x=>droid}', :lambda => nil, :expected => 'This is the droid you are looking for!'},
{:name => :err, :args => '"consider yourself in err"', :lambda => nil, :expected => 'consider yourself in err'},
{:name => :file, :args => '"call_em_all/rickon.txt"', :lambda => nil, :expected => 'who?'},
{:name => :filter, :args => '[4,5,6]', :lambda => '|$x| {true}', :expected => '[4, 5, 6]'},
{:name => :fqdn_rand, :args => '100000', :lambda => nil, :expected => /\d+\e/},
# generate requires a fully qualified exe; which requires specifics for windows vs posix
{:name => :generate, :args => generator[:args], :lambda => nil, :expected => generator[:expected]},
{:name => :hiera_array, :args => 'date,default_array', :lambda => nil, :expected => 'default_array'},
{:name => :hiera_hash, :args => 'date,default_hash', :lambda => nil, :expected => 'default_hash'},
{:name => :hiera_include, :args => 'date,call_em_all', :lambda => nil, :expected => ''},
{:name => :hiera, :args => 'date,default_date', :lambda => nil, :expected => 'default_date'},
{:name => :include, :args => 'call_em_all', :lambda => nil, :expected => ''},
{:name => :info, :args => '"consider yourself informed"', :lambda => nil, :expected => 'consider yourself informed'},
{:name => :inline_epp, :args => '\'<%= $x %>\',{x=>10}', :lambda => nil, :expected => '10'},
{:name => :inline_template, :args => '\'empty<%= @x %>space\'', :lambda => nil, :expected => 'emptyspace'},
# test the living life out of this thing in lookup.rb, and it doesn't allow for a default value
#{:name => :lookup, :args => 'date,lookup_date', :lambda => nil, :expected => ''}, # well tested elsewhere
{:name => :map, :args => '[7,8,9]', :lambda => '|$x| {notice $x}', :expected => '[7, 8, 9]'},
{:name => :match, :args => '"abc", /b/', :lambda => nil, :expected => '[b]'},
{:name => :md5, :args => '"Bran"', :lambda => nil, :expected => '723f9ac32ceb881ddf4fb8fc1020cf83'},
{:name => :notice, :args => '"consider yourself under notice"', :lambda => nil, :expected => 'consider yourself under notice'},
{:name => :realize, :args => 'User[arya]', :lambda => nil, :expected => ''}, # TODO: create a virtual first
{:name => :reduce, :args => '[4,5,6]', :lambda => '|$sum, $n| { $sum+$n }', :expected => '15'},
#{:name => :reuse, :args => '[4,5,6]', :lambda => '|$sum, $n| { $sum+$n }', :expected => ''},
#{:name => :recycle, :args => '[4,5,6]', :lambda => '|$sum, $n| { $sum+$n }', :expected => ''},
{:name => :regsubst, :args => '"Cersei","Cer(\\w)ei","Daenery\\1"',:lambda => nil, :expected => 'Daenerys'},
# explicitly called in call_em_all; implicitly called by the include above
#{:name => :require, :args => '[4,5,6]', :lambda => nil, :expected => ''},
{:name => :scanf, :args => '"Eddard Stark","%6s"', :lambda => nil, :expected => '[Eddard]'},
{:name => :sha1, :args => '"Sansa"', :lambda => nil, :expected => '4337ce5e4095e565d51e0ef4c80df1fecf238b29'},
{:name => :shellquote, :args => '["-1", "--two"]', :lambda => nil, :expected => '-1 --two'},
{:name => :slice, :args => '[1,2,3,4,5,6], 2', :lambda => nil, :expected => '[[1, 2], [3, 4], [5, 6]]'},
{:name => :split, :args => '"9,8,7",","', :lambda => nil, :expected => '[9, 8, 7]'},
{:name => :sprintf, :args => '"%b","123"', :lambda => nil, :expected => '1111011'},
# explicitly called in call_em_all
#{:name => :tag, :args => '[4,5,6]', :lambda => nil, :expected => ''},
{:name => :tagged, :args => '"yer_it"', :lambda => nil, :expected => 'false'},
{:name => :template, :args => '"call_em_all/template.erb"', :lambda => nil, :expected => 'no defaultsno space'},
{:name => :versioncmp, :args => '"1","2"', :lambda => nil, :expected => '-1'},
{:name => :warning, :args => '"consider yourself warned"', :lambda => nil, :expected => 'consider yourself warned'},
{:name => :with, :args => '1, "Catelyn"', :lambda => '|$x| {notice $x}', :expected => '1'},
# do this one last or it will not allow the others to run.
{:name => :fail, :args => '"Jon Snow"', :lambda => nil, :expected => 'Error while evaluating a Function Call, Jon Snow'},
]
functions_3x = [
{:name => :alert, :args => '"consider yourself on alert"', :lambda => nil, :expected => 'consider yourself on alert'},
{:name => :assert_type, :args => '"String[1]", "Valar morghulis"', :lambda => nil, :expected => 'Valar morghulis'},
# this is explicitly called from call_em_all module which is included below
#{:name => :contain, :args => 'call_em_all', :lambda => nil, :expected => ''},
# below doens't instance the resource. no output
{:name => :create_resources, :args => 'notify, {"w"=>{message=>"winter is coming"}}', :lambda => nil, :expected => ''},
{:name => :crit, :args => '"consider yourself critical"', :lambda => nil, :expected => 'consider yourself critical'},
{:name => :debug, :args => '"consider yourself bugged"', :lambda => nil, :expected => ''}, # no output expected unless run with debug
{:name => :defined, :args => 'File["/tmp"]', :lambda => nil, :expected => 'false'},
{:name => :digest, :args => '"Sansa"', :lambda => nil, :expected => 'f16491bf0133c6103918b2edcd00cf89'},
{:name => :each, :args => '[1,2,3]', :lambda => '|$x| {notice $x}', :expected => '[1, 2, 3]'},
{:name => :emerg, :args => '"consider yourself emergent"', :lambda => nil, :expected => 'consider yourself emergent'},
{:name => :epp, :args => '"call_em_all/template.epp",{x=>droid}', :lambda => nil, :expected => 'This is the droid you are looking for!'},
{:name => :err, :args => '"consider yourself in err"', :lambda => nil, :expected => 'consider yourself in err'},
{:name => :file, :args => '"call_em_all/rickon.txt"', :lambda => nil, :expected => 'who?'},
{:name => :filter, :args => '[4,5,6]', :lambda => '|$x| {true}', :expected => '[4, 5, 6]'},
{:name => :fqdn_rand, :args => '100000', :lambda => nil, :expected => /\d+\e/},
# generate requires a fully qualified exe; which requires specifics for windows vs posix
{:name => :generate, :args => generator[:args], :lambda => nil, :expected => generator[:expected]},
{:name => :hiera_array, :args => 'date,default_array', :lambda => nil, :expected => 'default_array'},
{:name => :hiera_hash, :args => 'date,default_hash', :lambda => nil, :expected => 'default_hash'},
{:name => :hiera_include, :args => 'date,call_em_all', :lambda => nil, :expected => ''},
{:name => :hiera, :args => 'date,default_date', :lambda => nil, :expected => 'default_date'},
{:name => :include, :args => 'call_em_all', :lambda => nil, :expected => ''},
{:name => :info, :args => '"consider yourself informed"', :lambda => nil, :expected => 'consider yourself informed'},
{:name => :inline_epp, :args => '\'<%= $x %>\',{x=>10}', :lambda => nil, :expected => '10'},
{:name => :inline_template, :args => '\'empty<%= @x %>space\'', :lambda => nil, :expected => 'emptyspace'},
# test the living life out of this thing in lookup.rb, and it doesn't allow for a default value
#{:name => :lookup, :args => 'date,lookup_date', :lambda => nil, :expected => ''}, # well tested elsewhere
{:name => :map, :args => '[7,8,9]', :lambda => '|$x| {notice $x}', :expected => '[7, 8, 9]'},
{:name => :match, :args => '"abc", /b/', :lambda => nil, :expected => '[b]'},
{:name => :md5, :args => '"Bran"', :lambda => nil, :expected => '723f9ac32ceb881ddf4fb8fc1020cf83'},
{:name => :notice, :args => '"consider yourself under notice"', :lambda => nil, :expected => 'consider yourself under notice'},
{:name => :realize, :args => 'User[arya]', :lambda => nil, :expected => ''}, # TODO: create a virtual first
{:name => :reduce, :args => '[4,5,6]', :lambda => '|$sum, $n| { $sum+$n }', :expected => '15'},
#{:name => :reuse, :args => '[4,5,6]', :lambda => '|$sum, $n| { $sum+$n }', :expected => ''},
#{:name => :recycle, :args => '[4,5,6]', :lambda => '|$sum, $n| { $sum+$n }', :expected => ''},
{:name => :regsubst, :args => '"Cersei","Cer(\\w)ei","Daenery\\1"',:lambda => nil, :expected => 'Daenerys'},
# explicitly called in call_em_all; implicitly called by the include above
#{:name => :require, :args => '[4,5,6]', :lambda => nil, :expected => ''},
{:name => :scanf, :args => '"Eddard Stark","%6s"', :lambda => nil, :expected => '[Eddard]'},
{:name => :sha1, :args => '"Sansa"', :lambda => nil, :expected => '4337ce5e4095e565d51e0ef4c80df1fecf238b29'},
{:name => :shellquote, :args => '["-1", "--two"]', :lambda => nil, :expected => '-1 --two'},
{:name => :slice, :args => '[1,2,3,4,5,6], 2', :lambda => nil, :expected => '[[1, 2], [3, 4], [5, 6]]'},
{:name => :split, :args => '"9,8,7",","', :lambda => nil, :expected => '[9, 8, 7]'},
{:name => :sprintf, :args => '"%b","123"', :lambda => nil, :expected => '1111011'},
# explicitly called in call_em_all
#{:name => :tag, :args => '[4,5,6]', :lambda => nil, :expected => ''},
{:name => :tagged, :args => '"yer_it"', :lambda => nil, :expected => 'false'},
{:name => :template, :args => '"call_em_all/template.erb"', :lambda => nil, :expected => 'no defaultsno space'},
{:name => :versioncmp, :args => '"1","2"', :lambda => nil, :expected => '-1'},
{:name => :warning, :args => '"consider yourself warned"', :lambda => nil, :expected => 'consider yourself warned'},
{:name => :with, :args => '1, "Catelyn"', :lambda => '|$x| {notice $x}', :expected => '1'},
# do this one last or it will not allow the others to run.
{:name => :fail, :args => '"Jon Snow"', :lambda => nil, :expected => 'Error while evaluating a Function Call, Jon Snow'},
]

module_manifest = <<PP
module_manifest = <<PP
File {
ensure => directory,
}
Expand Down Expand Up @@ -135,19 +145,6 @@
}
PP

# create single manifest calling all functions
step 'Apply manifest containing all function calls'
def manifest_call_each_function_from_array(functions)
manifest = ''
# use index to work around puppet's imutable variables
# use variables so we can contatenate strings
functions.each_with_index do |function,index|
manifest << "$pre#{index} = \"sayeth #{function[:name]}: \" $output#{index} = #{function[:name]}(#{function[:args]}) #{function[:lambda]} notice \"${pre#{index}}${output#{index}}\"\n"
end
manifest
end

agents.each do |agent|
apply_manifest_on(agent, module_manifest, :catch_failures => true)
apply_manifest_on(agent, manifest_call_each_function_from_array(functions_3x),
{:modulepath => "#{testdir}/environments/production/modules/",
Expand Down

0 comments on commit d93f591

Please sign in to comment.