summaryrefslogtreecommitdiff
path: root/spec/functional
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2017-03-09 13:50:54 +0000
committerThom May <thom@chef.io>2017-03-09 13:50:54 +0000
commite66ed8e864c1c002f7bf613543aae8740cd87cd5 (patch)
treeb0da5493e8872dad0bf0f009c9b5eb27612675cb /spec/functional
parent873b7d0a2de2944d84ef47ae4c2248487196d4d9 (diff)
downloadchef-e66ed8e864c1c002f7bf613543aae8740cd87cd5.tar.gz
Ensure that there are no pesky // in our pathstm/fix_sol10_harder
This is a continuation of #5873, using a blunter instrument. Signed-off-by: Thom May <thom@chef.io>
Diffstat (limited to 'spec/functional')
-rw-r--r--spec/functional/knife/ssh_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/functional/knife/ssh_spec.rb b/spec/functional/knife/ssh_spec.rb
index 0de344f24e..dbd7b92c6c 100644
--- a/spec/functional/knife/ssh_spec.rb
+++ b/spec/functional/knife/ssh_spec.rb
@@ -254,7 +254,7 @@ describe Chef::Knife::Ssh do
end
it "uses the ssh_gateway_identity file" do
- expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { :keys => File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa"), :keys_only => true })
+ expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { :keys => File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa").squeeze("/"), :keys_only => true })
@knife.run
expect(@knife.config[:ssh_gateway_identity]).to eq("~/.ssh/aws-gateway.rsa")
end
@@ -268,7 +268,7 @@ describe Chef::Knife::Ssh do
end
it "uses the ssh_gateway_identity file" do
- expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { :keys => File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa"), :keys_only => true })
+ expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { :keys => File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa").squeeze("/"), :keys_only => true })
@knife.run
expect(@knife.config[:ssh_gateway_identity]).to eq("~/.ssh/aws-gateway.rsa")
end