From f52259d38646a50b96605a0700e96be36672eca0 Mon Sep 17 00:00:00 2001 From: Salim Alam Date: Wed, 6 Apr 2016 22:09:59 -0700 Subject: Fix spec --- spec/unit/knife/ssh_spec.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spec/unit/knife/ssh_spec.rb b/spec/unit/knife/ssh_spec.rb index 65cc5a97b4..44a133d858 100644 --- a/spec/unit/knife/ssh_spec.rb +++ b/spec/unit/knife/ssh_spec.rb @@ -203,8 +203,14 @@ describe Chef::Knife::Ssh do expect(@knife.session.servers[0].port).to eq(123) end + it "defaults to a timeout of 120 seconds" do + @knife.session_from_list([["the.b.org", nil]]) + expect(@knife.session.servers[0].options[:timeout]).to eq(120) + end + it "uses the timeout from Chef Config" do Chef::Config[:knife][:ssh_timeout] = 5 + @knife.config[:ssh_timeout] = nil @knife.session_from_list([["the.b.org", nil]]) expect(@knife.session.servers[0].options[:timeout]).to eq(5) end @@ -215,11 +221,6 @@ describe Chef::Knife::Ssh do expect(@knife.session.servers[0].options[:timeout]).to eq(6) end - it "defaults to no timeout" do - @knife.session_from_list([["the.b.org", nil]]) - expect(@knife.session.servers[0].options[:timeout]).to eq(nil) - end - it "uses the user from an ssh config file" do @knife.session_from_list([["the.b.org", 123]]) expect(@knife.session.servers[0].user).to eq("locutus") -- cgit v1.2.1