[digitalocean|compute] tests updates

tests/digitalocean/helper.rb

@@ -30,3 +30,13 @@ def fog_test_server_destroy
   server = service.servers.find { |s| s.name == 'fog-test-server' }
   server.destroy if server
 end
+
+at_exit do
+  server = service.servers.find { |s| s.name == 'fog-test-server' }
+  if server
+    server.wait_for(120) do
+      reload rescue nil; ready?
+    end
+  end
+  fog_test_server_destroy
+end

tests/digitalocean/models/compute/server_tests.rb

@@ -21,6 +21,7 @@ Shindo.tests("Fog::Compute[:digitalocean] | server model", ['digitalocean', 'com
         :name,
         :status,
         :backups_active,
+        :ip_address,
         :flavor_id,
         :region_id,
         :image_id

tests/digitalocean/requests/compute/create_server_tests.rb

@@ -1,21 +1,25 @@
 Shindo.tests('Fog::Compute[:digitalocean] | create_server request', ['digitalocean', 'compute']) do
 
+  @server_format = {
+    'id'             => Integer,
+    'name'           => String,
+    'image_id'       => Integer,
+    'size_id'        => Integer,
+    'event_id'       => Integer 
+  }
+
   service = Fog::Compute[:digitalocean]
 
   tests('success') do
 
-    test('#create_server') do
+    tests('#create_server').formats({'status' => 'OK', 'droplet' => @server_format}) do
-      data = Fog::Compute[:digitalocean].create_server 'fog-test',
+      data = Fog::Compute[:digitalocean].create_server 'fog-test-server',
                                                        service.flavors.first.id,
                                                        service.images.first.id,
                                                        service.regions.first.id
-      # wait some time before destroying the server
+      data.body
-      # otherwise the request could be ignored, YMMV
-      sleep 120
-      data.body['status'] == 'OK' and \
-        (service.destroy_server(data.body['droplet']['id']).body['status'] == 'OK')
     end
-
+    
   end
       
 

tests/digitalocean/requests/compute/destroy_server_tests.rb

@@ -1,10 +1,7 @@
 Shindo.tests('Fog::Compute[:digitalocean] | reboot_server request', ['digitalocean', 'compute']) do
 
   service = Fog::Compute[:digitalocean]
-  data = Fog::Compute[:digitalocean].create_server 'fog-test',
+  data = fog_test_server
-                                                   service.flavors.first.id,
-                                                   service.images.first.id,
-                                                   service.regions.first.id
 
   tests('success') do
 

tests/digitalocean/requests/compute/get_server_details_tests.rb

@@ -3,7 +3,9 @@ Shindo.tests('Fog::Compute[:digitalocean] | get_server_details request', ['digit
   tests('success') do
 
     test('#get_server_details') do
-      Fog::Compute[:digitalocean].get_server_details(nil).body.is_a? Hash
+      server = fog_test_server
+      body = Fog::Compute[:digitalocean].get_server_details(server.id).body
+      body['droplet']['name'] == 'fog-test-server'
     end
 
   end

tests/digitalocean/requests/compute/list_servers_tests.rb

@@ -1,9 +1,24 @@
 Shindo.tests('Fog::Compute[:digitalocean] | list_servers request', ['digitalocean', 'compute']) do
+  
+  @server_format = {
+    'id'             => Integer,
+    'name'           => String,
+    'image_id'       => Integer,
+    'size_id'        => Integer,
+    'region_id'      => Integer,
+    'backups_active' => Fog::Nullable::Boolean,
+    'ip_address'     => String,
+    'status'         => String
+  }
 
   tests('success') do
 
-    test('#list_servers') do
+    tests('#list_servers') do
-      Fog::Compute[:digitalocean].list_servers.body.is_a? Hash
+      Fog::Compute[:digitalocean].list_servers.body['droplets'].each do |server|
+        tests('format').data_matches_schema(@server_format) do
+          server
+        end
+      end
     end
 
   end