summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2012-12-17 15:23:16 -0800
committersersut <serdar@opscode.com>2012-12-17 15:23:16 -0800
commit1ae4846dc9050c4fb2b0bb271daf2bb8c00a6df6 (patch)
tree57fe75b06ea5fb23cfeec22b1ced5ad11adeeb47
parent908b9b6734c996bfb8705b9b9523ed4b69704611 (diff)
parent7272aa7193e1e70c0fb8eaa8e84099e1e4cff730 (diff)
downloadchef-1ae4846dc9050c4fb2b0bb271daf2bb8c00a6df6.tar.gz
Merge pull request #551 from opscode/knife-ssh-test-fix
Reload original knife config after knife functional tests.
-rw-r--r--chef/spec/functional/knife/ssh_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/chef/spec/functional/knife/ssh_spec.rb b/chef/spec/functional/knife/ssh_spec.rb
index 7e697238ff..3003bae3bc 100644
--- a/chef/spec/functional/knife/ssh_spec.rb
+++ b/chef/spec/functional/knife/ssh_spec.rb
@@ -23,6 +23,7 @@ describe Chef::Knife::Ssh do
before(:all) do
@original_config = Chef::Config.hash_dup
+ @original_knife_config = Chef::Config[:knife].dup
Chef::Knife::Ssh.load_deps
@server = TinyServer::Manager.new
@server.start
@@ -30,6 +31,7 @@ describe Chef::Knife::Ssh do
after(:all) do
Chef::Config.configuration = @original_config
+ Chef::Config[:knife] = @original_knife_config
@server.stop
end