Please review pull request #783: Fixes for acceptance failures opened by (cprice-puppet)
Description:
- some fixes for windows
- Opened: Tue May 15 19:04:49 UTC 2012
- Based on: puppetlabs:master (54da295f637ef75bcbc864b6740d6ae79c0901c1)
- Requested merge: cprice-puppet:cleanup/master/windows-acceptance-failures-20120515 (639682cce9f13aefb0276599676f73cdf42878e1)
Diff follows:
diff --git a/acceptance/tests/allow_arbitrary_node_name_fact_for_apply.rb b/acceptance/tests/allow_arbitrary_node_name_fact_for_apply.rb
index d7cf2dc..e4a1f8c 100644
--- a/acceptance/tests/allow_arbitrary_node_name_fact_for_apply.rb
+++ b/acceptance/tests/allow_arbitrary_node_name_fact_for_apply.rb
@@ -20,11 +20,14 @@
node_names.each do |node_name|
manifest << %Q[
node "#{node_name}" {
- exec { "echo #{success_message}": }
+ exec { "%s": }
}
]
end
-on agents, puppet_apply("--verbose --node_name_fact kernel"), :stdin => manifest do
- assert_match(success_message, stdout)
+agents.each do |agent|
+ echo_cmd = agent.echo(success_message)
+ on agent, puppet_apply("--verbose --node_name_fact kernel"), :stdin => manifest % echo_cmd do
+ assert_match(/#{success_message}.*executed successfully/, stdout)
+ end
end
diff --git a/acceptance/tests/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb b/acceptance/tests/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb
index 2dbbb3e..0605dd3 100644
--- a/acceptance/tests/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb
+++ b/acceptance/tests/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb
@@ -5,7 +5,7 @@
agents.each do |host|
if host['platform'].include?('windows')
on(host, puppet_kick(target), :acceptable_exit_codes => [1]) {
- assert_match(/Puppet kick is not supported/, stdout)
+ assert_match(/Puppet kick is not supported/, stderr)
}
else
on(host, puppet_kick(target), :acceptable_exit_codes => [3]) {
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
