haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests passing from Puppet update

This commit is contained in:
Mitchell Hashimoto 2011-07-22 23:56:04 -07:00
parent 14ca7ecc24
commit 3f9534ae7d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/vagrant/provisioners/puppet_test.rb
View File

@ -155,25 +155,25 @@ class PuppetProvisionerTest < Test::Unit::TestCase
end end
should "cd into the pp_path directory and run puppet" do should "cd into the pp_path directory and run puppet" do
expect_puppet_command("puppet #{@config.computed_manifest_file}") expect_puppet_command("puppet apply #{@config.computed_manifest_file}")
@action.run_puppet_client @action.run_puppet_client
end end
should "cd into the pp_path directory and run puppet with given options when given as an array" do should "cd into the pp_path directory and run puppet with given options when given as an array" do
@config.options = ["--modulepath", "modules", "--verbose"] @config.options = ["--modulepath", "modules", "--verbose"]
expect_puppet_command("puppet --modulepath modules --verbose #{@config.computed_manifest_file}") expect_puppet_command("puppet apply --modulepath modules --verbose #{@config.computed_manifest_file}")
@action.run_puppet_client @action.run_puppet_client
end end
should "cd into the pp_path directory and run puppet with the options when given as a string" do should "cd into the pp_path directory and run puppet with the options when given as a string" do
@config.options = "--modulepath modules --verbose" @config.options = "--modulepath modules --verbose"
expect_puppet_command("puppet --modulepath modules --verbose #{@config.computed_manifest_file}") expect_puppet_command("puppet apply --modulepath modules --verbose #{@config.computed_manifest_file}")
@action.run_puppet_client @action.run_puppet_client
end end
should "cd into the pp_path and run puppet with module paths if set" do should "cd into the pp_path and run puppet with module paths if set" do
@config.module_path = "foo" @config.module_path = "foo"
expect_puppet_command("puppet --modulepath '#{File.join(@config.pp_path, 'modules-0')}' #{@config.computed_manifest_file}") expect_puppet_command("puppet apply --modulepath '#{File.join(@config.pp_path, 'modules-0')}' #{@config.computed_manifest_file}")
@action.set_module_paths @action.set_module_paths
@action.run_puppet_client @action.run_puppet_client