Skip to content

More windows acceptance failure fixes #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pcarlisle merged 1 commit into from
May 15, 2012
+6 −6
Merged

More windows acceptance failure fixes #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions acceptance/tests/allow_arbitrary_node_name_fact_for_agent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
manifest = %Q[
Exec { path => "/usr/bin:/bin" }
node default {
exec { "false": }
notify { "false": }
}
]
manifest << node_names.map do |node_name|
%Q[
node "#{node_name}" {
exec { "echo #{success_message}": logoutput => true }
notify { "#{success_message}": }
}
]
end.join("\n")
Expand All @@ -45,6 +45,6 @@

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)
assert_match(/defined 'message'.*#{success_message}/, stdout)
end
end
6 changes: 3 additions & 3 deletions acceptance/tests/allow_arbitrary_node_name_for_agent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
create_remote_file master, manifest_file, <<MANIFEST
Exec { path => "/usr/bin:/bin" }
node default {
exec { "false": }
notify { "false": }
}
node specified_node_name {
exec { "echo #{success_message}": }
notify { "#{success_message}": }
}
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_value specified_node_name --server #{master}") do
assert_match(success_message, stdout)
assert_match(/defined 'message'.*#{success_message}/, stdout)
end
end