(MAINT) Rename New Port Config

Rename port to check_pending_port and port_timeout to
check_pending_timeout.

The default settings have also been moved to a location where other
defaults are being set.
This commit is contained in:
Colin 2015-12-21 11:54:22 -08:00
parent f580f9915e
commit 38f962f514
4 changed files with 13 additions and 35 deletions

View file

@ -33,35 +33,15 @@ describe 'Pool Manager' do
end
context 'host is in pool (defaults)' do
let(:vm_finder) { double('vm_finder') }
let(:tcpsocket) { double('TCPSocket') }
let(:config) { {config: {}} }
it 'calls move_pending_vm_to_ready' do
stub_const("TCPSocket", tcpsocket)
allow(pool_helper).to receive(:find_vm).and_return(vm_finder)
allow(vm_finder).to receive(:summary).and_return(nil)
# ensure the default port was used
allow(tcpsocket).to receive(:new).with(String, 22).and_return(true)
expect(vm_finder).to receive(:summary).once
expect(redis).not_to receive(:hget).with(String, 'clone')
subject._check_pending_vm(vm, pool, timeout)
end
end
context 'host is in pool (port config)' do
context 'host is in pool' do
let(:vm_finder) { double('vm_finder') }
let(:tcpsocket) { double('TCPSocket') }
# port and port timeout are now configurable.
# update the config mock
let(:port_no) { 99 }
let(:config) { {config: {
'port' => port_no,
'port_timeout' => 2}} }
'check_pending_port' => port_no,
'check_pending_timeout' => 2}} }
it 'calls move_pending_vm_to_ready' do
stub_const("TCPSocket", tcpsocket)
@ -77,6 +57,7 @@ describe 'Pool Manager' do
subject._check_pending_vm(vm, pool, timeout)
end
end
end
describe '#move_vm_to_ready' do