Reset configuration before each test

4 files changed, 0 insertions, 16 deletions

diff --git a/spec/functional/knife/cookbook_delete_spec.rb b/spec/functional/knife/cookbook_delete_spec.rb
index 568e1a7bb4..1dbd604ca5 100644
--- a/spec/functional/knife/cookbook_delete_spec.rb
+++ b/spec/functional/knife/cookbook_delete_spec.rb
@@ -26,8 +26,6 @@ describe Chef::Knife::CookbookDelete do
   end
 
   before(:each) do
-    Chef::Config.reset
-
     @knife = Chef::Knife::CookbookDelete.new
     @api = TinyServer::API.instance
     @api.clear
@@ -38,8 +36,6 @@ describe Chef::Knife::CookbookDelete do
   end
 
   after(:all) do
-    # Be a good citizen
-    Chef::Config.reset
     @server.stop
   end
 
diff --git a/spec/functional/knife/exec_spec.rb b/spec/functional/knife/exec_spec.rb
index 7b31bcebbf..455160fd5c 100644
--- a/spec/functional/knife/exec_spec.rb
+++ b/spec/functional/knife/exec_spec.rb
@@ -26,8 +26,6 @@ describe Chef::Knife::Exec do
   end
 
   before(:each) do
-    Chef::Config.reset
-
     @knife = Chef::Knife::Exec.new
     @api = TinyServer::API.instance
     @api.clear
@@ -40,8 +38,6 @@ describe Chef::Knife::Exec do
   end
 
   after(:all) do
-    # Be a good citizen
-    Chef::Config.reset
     @server.stop
   end
 
diff --git a/spec/functional/knife/ssh_spec.rb b/spec/functional/knife/ssh_spec.rb
index d4aa42af2c..4cc588d01e 100644
--- a/spec/functional/knife/ssh_spec.rb
+++ b/spec/functional/knife/ssh_spec.rb
@@ -22,14 +22,12 @@ require 'tiny_server'
 describe Chef::Knife::Ssh do
 
   before(:all) do
-    Chef::Config.reset
     Chef::Knife::Ssh.load_deps
     @server = TinyServer::Manager.new
     @server.start
   end
 
   after(:all) do
-    Chef::Config.reset
     @server.stop
   end
 
diff --git a/spec/functional/resource/package_spec.rb b/spec/functional/resource/package_spec.rb
index cc416e9a23..55011271b5 100644
--- a/spec/functional/resource/package_spec.rb
+++ b/spec/functional/resource/package_spec.rb
@@ -202,7 +202,6 @@ describe Chef::Resource::Package, metadata do
         let(:file_cache_path) { Dir.mktmpdir }
 
         before do
-          Chef::Config.reset
           Chef::Config[:file_cache_path] = file_cache_path
           debconf_reset = 'chef-integration-test chef-integration-test/sample-var string "INVALID"'
           shell_out!("echo #{debconf_reset} |debconf-set-selections")
@@ -212,11 +211,6 @@ describe Chef::Resource::Package, metadata do
           FileUtils.rm_rf(file_cache_path)
         end
 
-        after :all do
-          # Be a good citizen
-          Chef::Config.reset
-        end
-
         context "with a preseed file" do
 
           let(:package_resource) do