summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc A. Paradise <marc.paradise@gmail.com>2021-03-31 17:29:36 -0400
committerMarc A. Paradise <marc.paradise@gmail.com>2021-03-31 17:29:36 -0400
commitc1968f5ef4f89ccedf69b8f384bb1cbd571af239 (patch)
treefeb1aa04654440152b8580444aee7ee7a2334eba
parent28425aa3936fa3f40ce125d56fd42029fba356ad (diff)
downloadchef-c1968f5ef4f89ccedf69b8f384bb1cbd571af239.tar.gz
code review and cleanup for knife gem move
Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
-rw-r--r--knife/lib/chef/knife/core/object_loader.rb1
-rw-r--r--spec/knife_spec_helper.rb4
-rw-r--r--spec/support/platform_helpers.rb1
3 files changed, 0 insertions, 6 deletions
diff --git a/knife/lib/chef/knife/core/object_loader.rb b/knife/lib/chef/knife/core/object_loader.rb
index edd8921c11..abfcb7b0cc 100644
--- a/knife/lib/chef/knife/core/object_loader.rb
+++ b/knife/lib/chef/knife/core/object_loader.rb
@@ -40,7 +40,6 @@ class Chef
def load_from(repo_location, *components)
unless object_file = find_file(repo_location, *components)
- puts "ZZZ LOoking for: #{repo_location} #{components}"
ui.error "Could not find or open file '#{components.last}' in current directory or in '#{repo_location}/#{components.join("/")}'"
exit 1
end
diff --git a/spec/knife_spec_helper.rb b/spec/knife_spec_helper.rb
index fd40f4002e..7395d2759b 100644
--- a/spec/knife_spec_helper.rb
+++ b/spec/knife_spec_helper.rb
@@ -55,7 +55,6 @@ require "chef/api_client_v1"
require "chef/mixin/versioned_api"
require "chef/server_api_versions"
-# MPTD relevant for knife?
if ENV["CHEF_FIPS"] == "1"
Chef::Config.init_openssl
end
@@ -68,9 +67,6 @@ require "spec/support/local_gems" if File.exist?(File.join(File.dirname(__FILE__
require "spec/support/platform_helpers"
require "spec/support/shared/unit/mock_shellout"
require "spec/support/recipe_dsl_helper"
-
-# MPTD - I had to add each of these manually, but I'm not clear why they were
-# _not_ required before splitting the gem.
require "spec/support/key_helpers"
require "spec/support/shared/unit/knife_shared"
require "spec/support/shared/functional/knife"
diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb
index 4cc9943709..27dc1d77c8 100644
--- a/spec/support/platform_helpers.rb
+++ b/spec/support/platform_helpers.rb
@@ -2,7 +2,6 @@ require "fcntl"
require "chef/mixin/shell_out"
require "ohai/mixin/http_helper"
require "ohai/mixin/gce_metadata"
-# MPTD - why has nobody had to do this before now?
require "spec/support/chef_helpers"
class ShellHelpers