kitchen-vra 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c7f119529c9a3562d45db721bf394fd9742d3a5
-  data.tar.gz: 7b2578c10fe9bfe7ed5d736c5b0ff0bd4de5cf7b
+  metadata.gz: 3f24be35c67ff7449f53d115bc977df954498fb7
+  data.tar.gz: ce2936e60a813f39932306710c2834e269cbcc2d
 SHA512:
-  metadata.gz: 073bbc3ed64031fb0e99fed859c4211362c354db494d0d21dec266f5039146c911d7fd72d33fb95dab34afaf0860ba9bd8b570ef55046077981e463fa0759dff
-  data.tar.gz: f8d23dbce4ad8a4c92b9ae42314063237c7149fce5f27c59db918a8d7046aa0baa8a0b470c956f1f87d30fe911fecd6d1b934946625ef7fd4c6b0a8516a3e235
+  metadata.gz: e5f0fdcc45c8494a9e223eeb3fcb5e92634d2bd92483470ac307763492c2bf4170ae81638694abc2e611be2d258bd9a729ca945621c9bc0d5b177f51d217a5b6
+  data.tar.gz: 59571993d793ff192dc305486bb9ae0a626dec51556b9c1468a9a6d67cee98fa9f9d46d7c4407e00968a7e58c2b5cfcffa8e20a3b4822bc7f74ab22f35521451

data/.travis.yml

@@ -0,0 +1,19 @@
+language: ruby
+cache: bundler
+sudo: false
+
+rvm:
+- 2.0.0
+- 2.1
+- 2.2
+
+branches:
+  only:
+    - master
+
+notifications:
+  slack:
+    on_success: change
+    on_failure: always
+    rooms:
+      secure: iESaLLqy5RK9os0fB83vXF0DgmMaWE8/tuhEg6rL6m2YlHq+mHwT5Hoc+YIFHbzl4PXS07i99ICFpGiUXuyHSn0jrNrI4z4BRA+3EZ+DLmhHGis3znWZJ1SxrCjYCZazj0SFG49mwaZjeggQNafPm/++sqzVVI5zJuLx+92Dwuztr4sa20Oa2UOKtCsgkNojmNwTKNqlN+bh+/pX7IH5rVUDMkd3k8Sdrd8Jk0AblztGvXJO/Sn+L6Ud9NAb38bVkC7Pw8Zows6Icw4ioCIwH4tl/AI6NwfvHJu33UqoEZu/8aBkSvgjGi+hTaztcwK9xMpK70AZlYEqNS4bVTAw/otAbw+xnqWUQfL3Kc2MjSpxdiLDXhELtV9jV/VlnDwX3L79B0sICKFdcLHrG8I4tMgCDxYTNjUHY+UcccHrPsYwXn01lkCc6Pa7LZnCqS69/2vVfdb8i2LOaEvMvj9uLeeADu2EHeqM0VV1Y58dRCef7Ls8cOiOZEqghG24H1Cu26vHKamLUMZu0ctYOOmxGP159j1iwCkygb2k10BXTGdFuMch3GE3RfwaPFk8UZoY+0tQNP5OGiHhhLyLo16yxXQuDyHq5kkSMuhT/34kdY2cZuJAi8U79YJkNb29CGPUeBJ1QqXulYg/xPKW03FBWxpbkPjdPr9WTbpMGOlhBwc=

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # kitchen-vra Changelog
 
+## v1.3.0 (2016-01-25)
+* [pr#10](https://github.com/chef-partners/kitchen-vra/pull/10) Capping the server wait_until_ready retry growth at 30 seconds.
+
 ## v1.2.0 (2015-11-25)
 * [pr#7](https://github.com/chef-partners/kitchen-vra/pull/7) Added retry logic for wait_until_ready in cases where Test Kitchen would unwind (such as DNS issues). Added fallback logic for when a host has no IP address, complimenting the `use_dns` parameter.
 

data/Rakefile

@@ -1 +1,8 @@
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:style)
+
+task default: [ :spec, :style ]

data/kitchen-vra.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec',     '~> 3.2'
   spec.add_development_dependency 'simplecov', '~> 0.10'
   spec.add_development_dependency 'webmock',   '~> 1.21'
+  spec.add_development_dependency 'rubocop',   '~> 0.35'
 end

data/lib/kitchen/driver/vra.rb

@@ -103,7 +103,7 @@ module Kitchen
         info("Server #{server.id} (#{server.name}) created. Waiting until ready...")
 
         try = 0
-        sleep_time = 1
+        sleep_time = 0
 
         begin
           instance.transport.connection(state).wait_until_ready
@@ -111,7 +111,7 @@ module Kitchen
           warn("Server #{server.id} (#{server.name}) not reachable: #{e.class} -- #{e.message}")
 
           try += 1
-          sleep_time *= 2
+          sleep_time += 5 if sleep_time < 30
 
           if try > config[:server_ready_retries]
             error('Retries exceeded. Destroying server...')

data/lib/kitchen/driver/vra_version.rb

@@ -18,6 +18,6 @@
 
 module Kitchen
   module Driver
-    VRA_VERSION = '1.2.0'
+    VRA_VERSION = '1.3.0'.freeze
   end
 end

data/spec/vra_spec.rb

@@ -260,8 +260,8 @@ describe Kitchen::Driver::Vra do
 
       it 'displays a warning, sleeps once, retries, errors, destroys, and raises' do
         expect(connection).to receive(:wait_until_ready).twice.and_raise(Timeout::Error)
-        expect(driver).to receive(:warn).once.with('Sleeping 2 seconds and retrying...')
-        expect(driver).to receive(:sleep).once.with(2)
+        expect(driver).to receive(:warn).once.with('Sleeping 5 seconds and retrying...')
+        expect(driver).to receive(:sleep).once.with(5)
         expect(driver).to receive(:error).with('Retries exceeded. Destroying server...')
         expect(driver).to receive(:destroy).with(state)
         expect { driver.wait_for_server(state, resource1) }.to raise_error(Timeout::Error)
@@ -273,10 +273,10 @@ describe Kitchen::Driver::Vra do
 
       it 'displays 2 warnings, sleeps twice, retries, errors, destroys, and raises' do
         expect(connection).to receive(:wait_until_ready).exactly(3).times.and_raise(Timeout::Error)
-        expect(driver).to receive(:warn).once.with('Sleeping 2 seconds and retrying...')
-        expect(driver).to receive(:warn).once.with('Sleeping 4 seconds and retrying...')
-        expect(driver).to receive(:sleep).once.with(2)
-        expect(driver).to receive(:sleep).once.with(4)
+        expect(driver).to receive(:warn).once.with('Sleeping 5 seconds and retrying...')
+        expect(driver).to receive(:warn).once.with('Sleeping 10 seconds and retrying...')
+        expect(driver).to receive(:sleep).once.with(5)
+        expect(driver).to receive(:sleep).once.with(10)
         expect(driver).to receive(:error).with('Retries exceeded. Destroying server...')
         expect(driver).to receive(:destroy).with(state)
         expect { driver.wait_for_server(state, resource1) }.to raise_error(Timeout::Error)
@@ -289,15 +289,30 @@ describe Kitchen::Driver::Vra do
       it 'displays 2 warnings, sleeps twice, retries, but does not destroy or raise' do
         expect(connection).to receive(:wait_until_ready).twice.and_raise(Timeout::Error)
         expect(connection).to receive(:wait_until_ready).once.and_return(true)
-        expect(driver).to receive(:warn).once.with('Sleeping 2 seconds and retrying...')
-        expect(driver).to receive(:warn).once.with('Sleeping 4 seconds and retrying...')
-        expect(driver).to receive(:sleep).once.with(2)
-        expect(driver).to receive(:sleep).once.with(4)
+        expect(driver).to receive(:warn).once.with('Sleeping 5 seconds and retrying...')
+        expect(driver).to receive(:warn).once.with('Sleeping 10 seconds and retrying...')
+        expect(driver).to receive(:sleep).once.with(5)
+        expect(driver).to receive(:sleep).once.with(10)
         expect(driver).not_to receive(:error)
         expect(driver).not_to receive(:destroy)
         expect { driver.wait_for_server(state, resource1) }.not_to raise_error
       end
     end
+
+    context 'when retries is 7, always erroring' do
+      let(:config) { { server_ready_retries: 8 } }
+
+      it 'caps the delays at 30 seconds' do
+        expect(connection).to receive(:wait_until_ready).exactly(9).times.and_raise(Timeout::Error)
+        expect(driver).to receive(:sleep).once.with(5)
+        expect(driver).to receive(:sleep).once.with(10)
+        expect(driver).to receive(:sleep).once.with(15)
+        expect(driver).to receive(:sleep).once.with(20)
+        expect(driver).to receive(:sleep).once.with(25)
+        expect(driver).to receive(:sleep).exactly(3).times.with(30)
+        expect { driver.wait_for_server(state, resource1) }.to raise_error(Timeout::Error)
+      end
+    end
   end
 
   describe '#destroy' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vra
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -114,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.21'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.35'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.35'
 description: A Test Kitchen driver for VMware vRealize Automation (vRA)
 email:
 - partnereng@chef.io
@@ -123,6 +137,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt