summaryrefslogtreecommitdiff
path: root/acceptance/top-cookbooks
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-02-09 11:00:19 -0800
committerSalim Alam <salam@chef.io>2016-02-09 15:05:06 -0800
commit16cfd8e7b465f09c46aee2de0c99dcd3837456ec (patch)
tree011cfabf957e9a785fff0a652bccfeb1cfcf1f89 /acceptance/top-cookbooks
parente05354056d19d6fe44206b111dc3da9a97e5ea16 (diff)
downloadchef-16cfd8e7b465f09c46aee2de0c99dcd3837456ec.tar.gz
Fix "chef-acceptance destroy" on first run; add -l debug to kitchen
Diffstat (limited to 'acceptance/top-cookbooks')
-rw-r--r--acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb22
1 files changed, 10 insertions, 12 deletions
diff --git a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb
index 9f4137d1ea..5d851a6ac6 100644
--- a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb
+++ b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb
@@ -25,19 +25,17 @@ class CookbookKitchen < KitchenAcceptance::Kitchen
}
action :run do
- if command == "converge"
- # Ensure the parent directory exists
- directory ::File.expand_path("..", repository_root) do
- recursive true
- end
+ # Ensure the parent directory exists
+ directory ::File.expand_path("..", repository_root) do
+ recursive true
+ end
- # Grab the cookbook
- # TODO Grab the source URL from supermarket
- # TODO get git to include its kitchen tests in the cookbook.
- git repository_root do
- repository new_resource.repository
- branch new_resource.branch
- end
+ # Grab the cookbook
+ # TODO Grab the source URL from supermarket
+ # TODO get git to include its kitchen tests in the cookbook.
+ git repository_root do
+ repository new_resource.repository
+ branch new_resource.branch
end
super()