Skip to content

Commit

Permalink
Merge pull request #105 from opscode/adamedx/release-0-8-0-rc2
Browse files Browse the repository at this point in the history
Update version number for 0.8.0.rc.2 release
  • Loading branch information
Adam Edwards authored and adamedx committed Oct 5, 2014
1 parent a488e6b commit dcd9185
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions lib/chef/knife/bootstrap_windows_base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ def self.included(includer)

option :auth_timeout,
:long => "--auth-timeout MINUTES",
:description => "The maximum time in minutes to wait to for authentication over the transport to the node to succeed. The default value is 25 minutes.",
:default => 25
:description => "The maximum time in minutes to wait to for authentication over the transport to the node to succeed. The default value is 2 minutes.",
:default => 2
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/knife-windows/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Knife
module Windows
VERSION = "0.8.0.rc.1"
VERSION = "0.8.0.rc.2"
MAJOR, MINOR, TINY = VERSION.split('.')
end
end
8 changes: 4 additions & 4 deletions spec/unit/knife/bootstrap_windows_winrm_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@
bootstrap.send(:wait_for_remote_response, 2)
end

it 'should have a wait timeout of 25 minutes by default' do
it 'should have a wait timeout of 2 minutes by default' do
allow(bootstrap).to receive(:run_command).and_raise(WinRM::WinRMHTTPTransportError)
allow(bootstrap).to receive(:create_bootstrap_bat_command).and_raise(SystemExit)
expect(bootstrap).to receive(:wait_for_remote_response).with(25)
expect(bootstrap).to receive(:wait_for_remote_response).with(2)
allow(bootstrap).to receive(:validate_name_args!).and_return(nil)
bootstrap.config[:auth_timeout] = bootstrap.options[:auth_timeout][:default]
expect { bootstrap.bootstrap }.to raise_error(SystemExit)
Expand Down Expand Up @@ -93,8 +93,8 @@
end


it 'should stop retrying if more than 25 minutes has elapsed' do
times = [ Time.new(2014, 4, 1, 22, 25), Time.new(2014, 4, 1, 22, 51), Time.new(2014, 4, 1, 22, 52) ]
it 'should stop retrying if more than 2 minutes has elapsed' do
times = [ Time.new(2014, 4, 1, 22, 25), Time.new(2014, 4, 1, 22, 51), Time.new(2014, 4, 1, 22, 28) ]
allow(Time).to receive(:now).and_return(*times)
run_command_result = lambda {raise WinRM::WinRMHTTPTransportError, '401'}
allow(bootstrap).to receive(:validate_name_args!).and_return(nil)
Expand Down

0 comments on commit dcd9185

Please sign in to comment.