Skip to content

Commit

Permalink
Merge pull request redhat-openstack#298 from bmjen/fix-windows-accept…
Browse files Browse the repository at this point in the history
…ance

fixes acceptance tests on windows
  • Loading branch information
Morgan Haskel committed Apr 17, 2015
2 parents 583c528 + 3809409 commit 30cb251
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
on host, shell('curl -k -o c:/puppetlabs-stdlib-4.5.1.tar.gz https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.5.1.tar.gz')
on host, puppet('module install c:/puppetlabs-stdlib-4.5.1.tar.gz --force --ignore-dependencies'), {:acceptable_exit_codes => [0, 1]}
on host, shell('curl -k -o c:/electrical-file_concat-1.0.1.tar.gz https://forgeapi.puppetlabs.com/v3/files/electrical-file_concat-1.0.1.tar.gz')
on host, puppet('module install c:/electrical-file_concat-1.0.0.tar.gz --force --ignore-dependencies'), {:acceptable_exit_codes => [0, 1]}
on host, puppet('module install c:/electrical-file_concat-1.0.1.tar.gz --force --ignore-dependencies'), {:acceptable_exit_codes => [0, 1]}
else
on host, puppet('module install puppetlabs-stdlib'), {:acceptable_exit_codes => [0, 1]}
on host, puppet('module install electrical-file_concat'), {:acceptable_exit_codes => [0, 1]}
Expand Down

0 comments on commit 30cb251

Please sign in to comment.