Fix "chef-acceptance destroy" on first run; add -l debug to kitchen

2 files changed, 12 insertions, 13 deletions

diff --git a/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb b/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb
index e0f860851c..0d4a388cd5 100644
--- a/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb
+++ b/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb
@@ -25,9 +25,10 @@ module KitchenAcceptance
     property :artifactory_username, String, default: lazy { ENV["ARTIFACTORY_USERNAME"] }
     property :artifactory_password, String, default: lazy { ENV["ARTIFACTORY_PASSWORD"] }
     property :env, Hash, default: {}
+    property :kitchen_options, String, default: "-l debug"
 
     action :run do
-      execute "bundle exec kitchen #{command}#{instances ? " #{instances}" : ""}" do
+      execute "bundle exec kitchen #{command}#{instances ? " #{instances}" : ""}#{kitchen_options ? " #{kitchen_options}" : ""}" do
         cwd kitchen_dir
         env({
           "KITCHEN_DRIVER" => driver,
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()