Updated Fog.wait_for to throw a timeout exception instead of returning false #1368

lib/fog/brightbox/models/compute/server.rb

@@ -188,11 +188,10 @@ module Fog
         def soft_reboot
           shutdown
           # FIXME Using side effect of wait_for's (evaluated block) to detect timeouts
-          if wait_for(20) { ! ready? }
-            # Server is now down, start it up again
-            start
-          else
-            # We timed out
+          begin
+            wait_for(20) { ! ready? }
+            start            
+          rescue Fog::Errors::Timeout => e
             false
           end
         end

lib/fog/core/errors.rb

@@ -17,6 +17,8 @@ module Fog
     class NotFound < Fog::Errors::Error; end
 
     class LoadError < LoadError; end
+    
+    class TimeoutError< Fog::Errors::Error; end
 
     # @return [String] The error message that will be raised, if credentials cannot be found
     def self.missing_credentials

lib/fog/core/wait_for.rb

@@ -7,7 +7,7 @@ module Fog
       duration = Time.now - start
     end
     if duration > timeout
-      false
+      raise Errors::TimeoutError.new("The specified timeout (#{timeout} seconds) was exceeded")
     else
       { :duration => duration }
     end

tests/core/wait_for_tests.rb

@@ -0,0 +1,13 @@
+Shindo.tests('Fog#wait_for', 'core') do
+  tests("success") do
+    tests('Fog#wait_for').formats(:duration => Integer) do
+      Fog.wait_for(1) { true }
+    end
+  end
+  
+  tests("failure") do
+    tests('Fog#wait_for').raises(Fog::Errors::TimeoutError) do
+      Fog.wait_for(2) { false }
+    end
+  end
+end