Merge pull request #110 from BobbyRyterski/2.1.0_rescue_timeout

Fail action when network info isn't available

lib/kitchen/driver/openstack.rb

@@ -310,8 +310,12 @@ def get_ip(server)
 
         # make sure we have the latest info
         info 'Waiting for network information to be available...'
-        w = server.wait_for { reload && !addresses.empty? }
-        debug "Waited #{w[:duration]} seconds for network information."
+        begin
+          w = server.wait_for { !addresses.empty? }
+          debug "Waited #{w[:duration]} seconds for network information."
+        rescue Fog::Errors::TimeoutError
+          raise ActionFailed, 'Could not get network information (timed out)'
+        end
 
         # should also work for private networks
         if config[:openstack_network_name]

spec/kitchen/driver/openstack_spec.rb

@@ -988,6 +988,17 @@
         expect { driver.send(:get_ip, server) }.to raise_error(expected)
       end
     end
+
+    context 'when network information is not found' do
+      before do
+        allow(server).to receive(:wait_for).and_raise(Fog::Errors::TimeoutError)
+      end
+
+      it 'raises an exception' do
+        expected = Kitchen::ActionFailed
+        expect { driver.send(:get_ip, server) }.to raise_error(expected)
+      end
+    end
   end
 
   describe '#parse_ips' do