tests/rackspace/requests/compute_v2/attachment_tests.rb in fog-1.8.0 vs tests/rackspace/requests/compute_v2/attachment_tests.rb in fog-1.9.0

@@ -1,54 +1,54 @@
 Shindo.tests('Fog::Compute::RackspaceV2 | attachment_tests', ['rackspace']) do
+  compute_service       = Fog::Compute::RackspaceV2.new
+  block_storage_service = Fog::Rackspace::BlockStorage.new
+  image_id              = Fog.credentials[:rackspace_image_id] || compute_service.images.first.id
+  flavor_id             = Fog.credentials[:rackspace_flavor_id] || compute_service.flavors.first.id
+  timeout = Fog.mocking? ? 1 : 10
 
-  pending if Fog.mocking?
-
-  ATTACHMENT_FORMAT = {
+  attachment_format = {
     'volumeAttachment' => {
       'id' => String,
       'serverId' => String,
       'volumeId' => String,
       'device' => Fog::Nullable::String
     }
   }
 
-  LIST_ATTACHMENTS_FORMAT = {
-    'volumeAttachments' => [ATTACHMENT_FORMAT]
+  list_attachments_format = {
+    'volumeAttachments' => [attachment_format['volumeAttachment']]
   }
 
-  compute_service = Fog::Compute.new(:provider => 'Rackspace', :version => 'V2')
-  block_storage_service = Fog::Rackspace::BlockStorage.new
-
   name = 'fog' + Time.now.to_i.to_s
-  image_id = '3afe97b2-26dc-49c5-a2cc-a2fc8d80c001' # Ubuntu 11.10
-  flavor_id = '2' # 512 MB
+  image_id = image_id
+  flavor_id = flavor_id
   server_id = compute_service.create_server(name, image_id, flavor_id, 1, 1).body['server']['id']
-  volume_id = block_storage_service.create_volume(1).body['volume']['id']
+  volume_id = block_storage_service.create_volume(100).body['volume']['id']
   device_id = '/dev/xvde'
 
 
   tests('success') do
     until compute_service.get_server(server_id).body['server']['status'] == 'ACTIVE'
-      sleep 10
+      sleep timeout
     end
 
     until block_storage_service.get_volume(volume_id).body['volume']['status'] == 'available'
-      sleep 10
+      sleep timeout
     end
 
-    tests("#attach_volume(#{server_id}, #{volume_id}, #{device_id})").formats(ATTACHMENT_FORMAT) do
+    tests("#attach_volume(#{server_id}, #{volume_id}, #{device_id})").formats(attachment_format) do
       compute_service.attach_volume(server_id, volume_id, device_id).body
     end
 
-    tests("#list_attachments(#{server_id})").formats(LIST_ATTACHMENTS_FORMAT) do
+    tests("#list_attachments(#{server_id})").formats(list_attachments_format) do
       compute_service.list_attachments(server_id).body
     end
 
     until block_storage_service.get_volume(volume_id).body['volume']['status'] == 'in-use'
-      sleep 10
+      sleep timeout
     end
 
-    tests("#get_attachment(#{server_id}, #{volume_id})").formats(ATTACHMENT_FORMAT) do
+    tests("#get_attachment(#{server_id}, #{volume_id})").formats(attachment_format) do
       compute_service.get_attachment(server_id, volume_id).body
     end
 
     tests("#delete_attachment(#{server_id}, #{volume_id})").succeeds do
       compute_service.delete_attachment(server_id, volume_id)