Merge pull request #1748 from maginatics/timeout2

Fog::Model#wait_for: eliminate inner retry loop

lib/fog/core/model.rb

@@ -60,18 +60,19 @@ module Fog
     end
 
     def wait_for(timeout=Fog.timeout, interval=1, &block)
-      reload
+      reload_has_succeeded = false
-      retries = 3
+      duration = Fog.wait_for(timeout, interval) do # Note that duration = false if it times out
-      Fog.wait_for(timeout, interval) do
         if reload
-          retries = 3
+          reload_has_succeeded = true
-        elsif retries > 0
+          instance_eval(&block)
-          retries -= 1
+        else
-          sleep(1)
+          false
-        elsif retries == 0
-          raise Fog::Errors::Error.new("Reload failed, #{self.class} #{self.identity} went away.")
         end
-        instance_eval(&block)
+      end
+      if reload_has_succeeded
+        return duration # false if timeout; otherwise {:duration => elapsed time }
+      else
+        raise Fog::Errors::Error.new("Reload failed, #{self.class} #{self.identity} not present.")
       end
     end