Skip to content
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

(maint) Fix path for pxp-agent using new Windows MSI layout #464

Merged
merged 1 commit into from
Aug 3, 2016
Merged

(maint) Fix path for pxp-agent using new Windows MSI layout #464

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
4 changes: 3 additions & 1 deletion acceptance/tests/pxp_agent_version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
# Vendored Ruby needs to be on path for Windows/cygwin.
# Only do this for cygwin because other OSes (Cisco Nexus) do not handle setting env values inline.
if windows?(agent) then
version_command = "PATH=\"#{agent['privatebindir']}:$PATH\"" + " " + version_command
puppet_bindir = '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/puppet/bin:'+
'/cygdrive/c/Program Files/Puppet Labs/Puppet/puppet/bin'
version_command = "PATH=\"#{agent['privatebindir']}:#{puppet_bindir}:$PATH\"" + " " + version_command
end
on(agent, version_command) do |result|
assert(/[0-9\.]*/ =~ result.stdout, "Version number should be numbers and periods but was \"#{result.stdout.to_s}\"")
Expand Down