summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2019-11-12 14:56:56 -0800
committerTim Smith <tsmith84@gmail.com>2019-11-12 14:57:56 -0800
commit95775425dcbc5c13e0a3a7c62590059b45619a45 (patch)
tree0bfc127919010af89d5736a7f26ccc55265714ec
parent7906ee9f1ab477ff08d8836701ec9d69f47e8dfa (diff)
downloadchef-95775425dcbc5c13e0a3a7c62590059b45619a45.tar.gz
Remove the use of Chef Sugar from the Kitchen tests
No need for this anymore Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--kitchen-tests/cookbooks/end_to_end/attributes/default.rb4
-rw-r--r--kitchen-tests/cookbooks/end_to_end/libraries/chef-sugar.rb4
2 files changed, 2 insertions, 6 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/attributes/default.rb b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb
index 7b66f77b4b..027d9881d8 100644
--- a/kitchen-tests/cookbooks/end_to_end/attributes/default.rb
+++ b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb
@@ -1,5 +1,5 @@
-puts "CHEF SUGAR THINKS WE ARE ON UBUNTU" if ubuntu?
-puts "CHEF SUGAR THINKS WE ARE ON RHEL" if rhel?
+puts "CHEF UTILS THINKS WE ARE ON UBUNTU" if ubuntu?
+puts "CHEF UTILS THINKS WE ARE ON RHEL" if rhel?
#
# ubuntu cookbook overrides
diff --git a/kitchen-tests/cookbooks/end_to_end/libraries/chef-sugar.rb b/kitchen-tests/cookbooks/end_to_end/libraries/chef-sugar.rb
deleted file mode 100644
index 90d02a361f..0000000000
--- a/kitchen-tests/cookbooks/end_to_end/libraries/chef-sugar.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require "chef/sugar"
-
-# hack until this gets baked into chef-sugar so we can use chef-sugar in attributes files
-Chef::Node.send(:include, Chef::Sugar::DSL)