Merge pull request #273 from mattkirby/pooler_124

(POOLER-124) Fix evaluation of max_tries
This commit is contained in:
mchllweeks 2018-07-09 12:50:34 -07:00 committed by GitHub
commit 6f4f3cc4e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions

View file

@ -923,13 +923,8 @@ EOT
allow(subject).to receive(:sleep)
end
it 'should raise an error' do
expect{subject.connect_to_vsphere}.to raise_error(RuntimeError,'MockError')
end
it 'should retry the connection attempt config.max_tries times' do
pending('Resolution of issue https://github.com/puppetlabs/vmpooler/issues/199')
expect(RbVmomi::VIM).to receive(:connect).exactly(config[:config]['max_tries']).times.and_raise(RuntimeError,'MockError')
expect(RbVmomi::VIM).to receive(:connect).exactly(config[:config]['max_tries']).times
begin
# Swallow any errors
@ -939,7 +934,6 @@ EOT
end
it 'should increment the connect.fail counter config.max_tries times' do
pending('Resolution of issue https://github.com/puppetlabs/vmpooler/issues/199')
expect(metrics).to receive(:increment).with('connect.fail').exactly(config[:config]['max_tries']).times
begin
@ -954,7 +948,6 @@ EOT
].each do |testcase|
context "Configuration set for max_tries of #{testcase[:max_tries]} and retry_facter of #{testcase[:retry_factor]}" do
it "should sleep #{testcase[:max_tries] - 1} times between attempts with increasing timeout" do
pending('Resolution of issue https://github.com/puppetlabs/vmpooler/issues/199')
config[:config]['max_tries'] = testcase[:max_tries]
config[:config]['retry_factor'] = testcase[:retry_factor]