diff --git a/acceptance/tests/allow_arbitrary_node_name_fact_for_agent.rb b/acceptance/tests/allow_arbitrary_node_name_fact_for_agent.rb index c9ff3e4a8..4d7c43107 100644 --- a/acceptance/tests/allow_arbitrary_node_name_fact_for_agent.rb +++ b/acceptance/tests/allow_arbitrary_node_name_fact_for_agent.rb @@ -1,50 +1,50 @@ test_name "node_name_fact should be used to determine the node name for puppet agent" success_message = "node_name_fact setting was correctly used to determine the node name" node_names = [] on agents, facter('kernel') do node_names << stdout.chomp end node_names.uniq! authfile = "/tmp/auth.conf-2128-#{$$}" authconf = node_names.map do |node_name| %Q[ path /catalog/#{node_name} auth yes allow * path /node/#{node_name} auth yes allow * ] end.join("\n") manifest_file = "/tmp/node_name_value-test-#{$$}.pp" manifest = %Q[ Exec { path => "/usr/bin:/bin" } node default { exec { "false": } } ] manifest << node_names.map do |node_name| %Q[ node "#{node_name}" { - exec { "echo #{success_message}": } + exec { "echo #{success_message}": logoutput => true } } ] end.join("\n") create_remote_file master, authfile, authconf create_remote_file master, manifest_file, manifest on master, "chmod 644 #{authfile} #{manifest_file}" with_master_running_on(master, "--rest_authconfig #{authfile} --manifest #{manifest_file} --daemonize --dns_alt_names=\"puppet, $(hostname -s), $(hostname -f)\" --autosign true") do run_agent_on(agents, "--no-daemonize --verbose --onetime --node_name_fact kernel --server #{master}") do assert_match(success_message, stdout) end end diff --git a/acceptance/tests/allow_arbitrary_node_name_for_apply.rb b/acceptance/tests/allow_arbitrary_node_name_for_apply.rb index 4daa8a65b..f620cd95f 100644 --- a/acceptance/tests/allow_arbitrary_node_name_for_apply.rb +++ b/acceptance/tests/allow_arbitrary_node_name_for_apply.rb @@ -1,17 +1,17 @@ test_name "node_name_value should be used as the node name for puppet apply" success_message = "node_name_value setting was correctly used as the node name" manifest = %Q[ Exec { path => "/usr/bin:/bin" } node default { exec { "false": } } node a_different_node_name { - exec { "echo #{success_message}": } + exec { "echo #{success_message}": logoutput => true } } ] on agents, puppet_apply("--verbose --node_name_value a_different_node_name"), :stdin => manifest do assert_match(success_message, stdout) end