diff options
author | danielsdeleo <dan@opscode.com> | 2013-01-17 13:43:28 -0800 |
---|---|---|
committer | danielsdeleo <dan@opscode.com> | 2013-01-17 15:02:54 -0800 |
commit | 62f9b0e3be8e22eef092163c331b7d3f8d350f94 (patch) | |
tree | 6b37c7a275918580b59c16de32a16c24f5dbe77f /spec/functional/knife/ssh_spec.rb | |
parent | 30ec971df95264b39e5e403c08b634d4708f5bee (diff) | |
parent | b568c4d060765e75023f50f24d0a394ada5aed0b (diff) | |
download | chef-62f9b0e3be8e22eef092163c331b7d3f8d350f94.tar.gz |
Merge branch '10-stable' into integrate-chef-10-18-0
Conflicts:
.gitattributes
chef-expander/Rakefile
chef-expander/lib/chef/expander/version.rb
chef-server-api/Rakefile
chef-server-api/chef-server-api.gemspec
chef-server-api/lib/chef-server-api/version.rb
chef-server-webui/Rakefile
chef-server-webui/chef-server-webui.gemspec
chef-server-webui/lib/chef-server-webui/version.rb
chef-server/Rakefile
chef-server/lib/chef-server/version.rb
chef-solr/lib/chef/solr/version.rb
chef.gemspec
chef/Rakefile
chef/spec/support/platform_helpers.rb
chef/spec/support/shared/functional/file_resource.rb
chef/spec/unit/api_client_spec.rb
chef/spec/unit/provider/directory_spec.rb
ci/jenkins_run_tests.bat
ci/jenkins_run_tests.sh
distro/common/html/chef-client.8.html
distro/common/html/chef-expander.8.html
distro/common/html/chef-expanderctl.8.html
distro/common/html/chef-server-webui.8.html
distro/common/html/chef-server.8.html
distro/common/html/chef-shell.1.html
distro/common/html/chef-solo.8.html
distro/common/html/chef-solr.8.html
distro/common/html/knife-bootstrap.1.html
distro/common/html/knife-client.1.html
distro/common/html/knife-configure.1.html
distro/common/html/knife-cookbook-site.1.html
distro/common/html/knife-cookbook.1.html
distro/common/html/knife-data-bag.1.html
distro/common/html/knife-environment.1.html
distro/common/html/knife-exec.1.html
distro/common/html/knife-index.1.html
distro/common/html/knife-node.1.html
distro/common/html/knife-role.1.html
distro/common/html/knife-search.1.html
distro/common/html/knife-ssh.1.html
distro/common/html/knife-status.1.html
distro/common/html/knife-tag.1.html
distro/common/html/knife.1.html
distro/common/man/man1/chef-shell.1
distro/common/man/man1/knife-bootstrap.1
distro/common/man/man1/knife-client.1
distro/common/man/man1/knife-configure.1
distro/common/man/man1/knife-cookbook-site.1
distro/common/man/man1/knife-cookbook.1
distro/common/man/man1/knife-data-bag.1
distro/common/man/man1/knife-environment.1
distro/common/man/man1/knife-exec.1
distro/common/man/man1/knife-index.1
distro/common/man/man1/knife-node.1
distro/common/man/man1/knife-role.1
distro/common/man/man1/knife-search.1
distro/common/man/man1/knife-ssh.1
distro/common/man/man1/knife-status.1
distro/common/man/man1/knife-tag.1
distro/common/man/man1/knife.1
distro/common/man/man8/chef-client.8
distro/common/man/man8/chef-expander.8
distro/common/man/man8/chef-expanderctl.8
distro/common/man/man8/chef-server-webui.8
distro/common/man/man8/chef-server.8
distro/common/man/man8/chef-solo.8
distro/common/man/man8/chef-solr.8
lib/chef/api_client.rb
lib/chef/rest.rb
lib/chef/version.rb
spec/functional/knife/ssh_spec.rb
spec/functional/resource/cookbook_file_spec.rb
spec/spec_helper.rb
spec/stress/win32/security_spec.rb
spec/support/shared/functional/securable_resource.rb
spec/unit/config_spec.rb
spec/unit/knife/ssh_spec.rb
Diffstat (limited to 'spec/functional/knife/ssh_spec.rb')
-rw-r--r-- | spec/functional/knife/ssh_spec.rb | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/spec/functional/knife/ssh_spec.rb b/spec/functional/knife/ssh_spec.rb index 53012ce56d..a853e8de19 100644 --- a/spec/functional/knife/ssh_spec.rb +++ b/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 @@ -89,6 +91,19 @@ describe Chef::Knife::Ssh do end end + describe "port" do + context "when -p 31337 is provided" do + before do + setup_knife(['-p 31337', '*:*', 'uptime']) + end + + it "uses the ssh_port" do + @knife.run + @knife.config[:ssh_port].should == "31337" + end + end + end + describe "user" do context "when knife[:ssh_user] is set" do before do @@ -192,6 +207,49 @@ describe Chef::Knife::Ssh do end end + describe "gateway" do + context "when knife[:ssh_gateway] is set" do + before do + setup_knife(['*:*', 'uptime']) + Chef::Config[:knife][:ssh_gateway] = "user@ec2.public_hostname" + end + + it "uses the ssh_gateway" do + @knife.session.should_receive(:via).with("ec2.public_hostname", "user", {}) + @knife.run + @knife.config[:ssh_gateway].should == "user@ec2.public_hostname" + end + end + + context "when -G user@ec2.public_hostname is provided" do + before do + setup_knife(['-G user@ec2.public_hostname', '*:*', 'uptime']) + Chef::Config[:knife][:ssh_gateway] = nil + end + + it "uses the ssh_gateway" do + @knife.session.should_receive(:via).with("ec2.public_hostname", "user", {}) + @knife.run + @knife.config[:ssh_gateway].should == "user@ec2.public_hostname" + end + end + + context "when the gateway requires a password" do + before do + setup_knife(['-G user@ec2.public_hostname', '*:*', 'uptime']) + Chef::Config[:knife][:ssh_gateway] = nil + @knife.session.stub(:via) do |host, user, options| + raise Net::SSH::AuthenticationFailed unless options[:password] + end + end + + it "should prompt the user for a password" do + @knife.ui.should_receive(:ask).with("Enter the password for user@ec2.public_hostname: ").and_return("password") + @knife.run + end + end + end + def setup_knife(params=[]) @knife = Chef::Knife::Ssh.new(params) # We explicitly avoid running #configure_chef, which would read a knife.rb |