Cleanup and refactor digitalocean integration

* Handle case where droplet is locked pending events, DO support says
they are planning to expose something in the api to show these events.
Until then this is the best we have.
* Whitespace cleanup
* Refactor test helpers
* Use the collection helper for the digitalocean servers collection

lib/fog/digitalocean/compute.rb

@@ -90,14 +90,43 @@ module Fog
           params[:query].merge!(:api_key   => @digitalocean_api_key)
           params[:query].merge!(:client_id => @digitalocean_client_id)
 
-          response = @connection.request(params)
+          response = retry_event_lock { parse @connection.request(params) }
 
           unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
             if response.body['status'] != 'OK'
+              case response.body['error_message']
+              when /No Droplets Found/
+                raise Fog::Errors::NotFound.new
+              else
                 raise Fog::Errors::Error.new response.body.to_s
               end
             end
+          end
+          response
+        end
+
+        private
+
+        def parse(response)
+          return response if response.body.empty?
+          response.body = Fog::JSON.decode(response.body)
+          response
+        end
+
+        def retry_event_lock
+          count   = 0
+          reponse = nil
+          while count < 5
+            response = yield
+
+            if response.body && response.body['error_message'] =~ /There is already a pending event for the droplet/
+              count += 1
+              sleep count ** 3
+            else
+              break
+            end
+          end
+
           response
         end
 

tests/digitalocean/helper.rb

@@ -4,36 +4,43 @@ def service
   Fog::Compute[:digitalocean]
 end
 
-# Create a long lived server for the tests
+def fog_test_server_attributes
-def fog_test_server
+  image = service.images.find { |i| i.name == 'Ubuntu 12.04 x64' }
-  server = service.servers.find { |s| s.name == 'fog-test-server' }
-  unless server
-    image = service.images.find { |i| i.name == 'Ubuntu 12.04 x64 Server' }
   region = service.regions.find { |r| r.name == 'New York 1' }
   flavor = service.flavors.find { |r| r.name == '512MB' }
-    server = service.servers.create :name      => 'fog-test-server',
+
+  {
     :image_id  => image.id,
     :region_id => region.id,
     :flavor_id => flavor.id
-    # Wait for the server to come up
+  }
-    begin
-      server.wait_for(120) { server.reload rescue nil; server.ready? }
-    rescue Fog::Errors::TimeoutError
-      # Server bootstrap took more than 120 secs!
 end
+
+def fog_server_name
+  "fog-server-test"
+end
+
+# Create a long lived server for the tests
+def fog_test_server
+  server = service.servers.find { |s| s.name == fog_server_name }
+  unless server
+    server = service.servers.create({
+      :name => fog_server_name
+    }.merge(fog_test_server_attributes))
+    server.wait_for { ready? }
   end
   server
 end
 
 # Destroy the long lived server
 def fog_test_server_destroy
-  server = service.servers.find { |s| s.name == 'fog-test-server' }
+  server = service.servers.find { |s| s.name == fog_server_name }
   server.destroy if server
 end
 
 at_exit do
   unless Fog.mocking? || Fog.credentials[:digitalocean_api_key].nil?
-    server = service.servers.find { |s| s.name == 'fog-test-server' }
+    server = service.servers.find { |s| s.name == fog_server_name }
     if server
       server.wait_for(120) do
         reload rescue nil; ready?

tests/digitalocean/models/compute/servers_tests.rb

@@ -1,35 +1,12 @@
 Shindo.tests('Fog::Compute[:digitalocean] | servers collection', ['digitalocean']) do
-
   service = Fog::Compute[:digitalocean]
 
-  tests('The servers collection') do
+  options = {
-    servers = service.servers.all
+    :name => "#{fog_server_name}-#{Time.now.to_i.to_s}"
-
+  }.merge fog_test_server_attributes
-    server = fog_test_server
-
-    test('should NOT be empty') do
-      servers.reload
-      !servers.empty? 
-    end
-
-    test('should be a kind of Fog::Compute::DigitalOcean::Servers') do 
-      servers.kind_of? Fog::Compute::DigitalOcean::Servers 
-    end
-
-    tests('should have Fog::Compute::DigitalOcean::Servers inside') do
-      servers.each do |s|
-        test { s.kind_of? Fog::Compute::DigitalOcean::Server }
-      end
-    end
-
-    tests('should be able to reload itself').succeeds { servers.reload }
-
-    tests('should be able to get a model') do
-      test('by instance id') do
-        servers.get(server.id).kind_of? Fog::Compute::DigitalOcean::Server
-      end
-    end
 
+  collection_tests(service.servers, options, true) do
+    @instance.wait_for { ready? }
   end
 
 end

tests/digitalocean/requests/compute/create_server_tests.rb

@@ -15,7 +15,7 @@ Shindo.tests('Fog::Compute[:digitalocean] | create_server request', ['digitaloce
     tests('#create_server').formats({'status' => 'OK', 'droplet' => @server_format}) do
       image = service.images.find { |img| img.name == 'Ubuntu 12.04 x64 Server' }
       flavor = service.flavors.find { |f| f.name == '512MB' }
-      data = Fog::Compute[:digitalocean].create_server 'fog-test-server',
+      data = Fog::Compute[:digitalocean].create_server fog_server_name,
                                                        flavor.id,
                                                        image.id,
                                                        service.regions.first.id

tests/digitalocean/requests/compute/get_server_details_tests.rb

@@ -5,7 +5,7 @@ Shindo.tests('Fog::Compute[:digitalocean] | get_server_details request', ['digit
     test('#get_server_details') do
       server = fog_test_server
       body = Fog::Compute[:digitalocean].get_server_details(server.id).body
-      body['droplet']['name'] == 'fog-test-server'
+      body['droplet']['name'] == fog_server_name
     end
 
   end