More terse test

This commit is contained in:
Mitchell Hashimoto 2011-07-22 23:07:44 -07:00
parent 74c2a8c810
commit 16c21ed9d1
1 changed files with 6 additions and 11 deletions

View File

@ -56,17 +56,12 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
assert_equal [[:host, local_path, remote_path]], @action.expanded_folders([:host, path]) assert_equal [[:host, local_path, remote_path]], @action.expanded_folders([:host, path])
end end
should "expand multiple host folders properly" do should "share roles and cookbooks in different folders" do
cookbooks_path = "cookbooks" local_roles_path = File.expand_path('roles',@env.root_path)
cookbooks_local_path = File.expand_path(cookbooks_path, @env.root_path) local_cookbooks_path = File.expand_path('cookbooks',@env.root_path)
cookbooks_remote_path = "#{@action.config.provisioning_path}/chef-solo-4" remote_roles_path = @action.expanded_folders([:host,local_roles_path])[0][2]
roles_path = "roles" remote_cookbooks_path = @action.expanded_folders([:host,local_cookbooks_path])[0][2]
roles_local_path = File.expand_path(roles_path, @env.root_path) assert_not_equal remote_roles_path, remote_cookbooks_path
roles_remote_path = "#{@action.config.provisioning_path}/chef-solo-5"
assert_not_equal @action.expanded_folders([:host, cookbooks_path])[0].last, @action.expanded_folders([:host, roles_path])[0].last
assert_equal [[:host, cookbooks_local_path, cookbooks_remote_path]], @action.expanded_folders([:host, cookbooks_path])
assert_equal [[:host, roles_local_path, roles_remote_path]], @action.expanded_folders([:host, roles_path])
end end
end end