diff options
| author | Thom May <thom@may.lt> | 2017-01-17 18:55:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 18:55:52 +0000 |
| commit | 9ba9c3cff10645b1448e424be3a61816aa96f384 (patch) | |
| tree | 1edebeed02720aa993201392b100ef1bd346028e /spec | |
| parent | 51d1b7e2003bee7c03f363866743abd6c9b6750d (diff) | |
| parent | 24d230b09a68c8b6857d060b398e779a23ba80bc (diff) | |
| download | chef-9ba9c3cff10645b1448e424be3a61816aa96f384.tar.gz | |
Merge pull request #5726 from higanworks/compatible_with_net-ssh4
pass true as 2nd args for Net::SSH.configuration_for by default.
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/unit/knife/ssh_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/knife/ssh_spec.rb b/spec/unit/knife/ssh_spec.rb index 44a133d858..9263a0b8e5 100644 --- a/spec/unit/knife/ssh_spec.rb +++ b/spec/unit/knife/ssh_spec.rb @@ -190,7 +190,7 @@ describe Chef::Knife::Ssh do before :each do @knife.instance_variable_set(:@longest, 0) ssh_config = { :timeout => 50, :user => "locutus", :port => 23 } - allow(Net::SSH).to receive(:configuration_for).with("the.b.org").and_return(ssh_config) + allow(Net::SSH).to receive(:configuration_for).with("the.b.org", true).and_return(ssh_config) end it "uses the port from an ssh config file" do |