fog 0.3.7 → 0.3.8

data/tests/aws/requests/storage/object_tests.rb

@@ -0,0 +1,63 @@
+Shindo.tests('AWS::Storage | object requests', ['aws']) do
+
+  @directory = AWS[:storage].directories.create(:key => 'fogobjecttests')
+
+  tests('success') do
+
+    tests("#put_object('#{@directory.identity}', 'fog_object', lorem_file)").succeeds do
+      AWS[:storage].put_object(@directory.identity, 'fog_object', lorem_file)
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_object')").returns(lorem_file.read) do
+      AWS[:storage].get_object(@directory.identity, 'fog_object').body
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_object', &block)").returns(lorem_file.read) do
+      data = ''
+      AWS[:storage].get_object(@directory.identity, 'fog_object') do |chunk|
+        data << chunk
+      end
+      data
+    end
+
+    tests("#head_object('#{@directory.identity}', 'fog_object')").succeeds do
+      AWS[:storage].head_object(@directory.identity, 'fog_object')
+    end
+
+    tests("#delete_object('#{@directory.identity}', 'fog_object')").succeeds do
+      AWS[:storage].delete_object(@directory.identity, 'fog_object')
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#put_object('fognonbucket', 'fog_non_object', lorem_file)").raises(Excon::Errors::NotFound) do
+      AWS[:storage].put_object('fognonbucket', 'fog_non_object', lorem_file)
+    end
+
+    tests("#get_object('fognonbucket', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      AWS[:storage].get_object('fognonbucket', 'fog_non_object')
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      AWS[:storage].get_object(@directory.identity, 'fog_non_object')
+    end
+
+    tests("#head_object('fognonbucket', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      AWS[:storage].head_object('fognonbucket', 'fog_non_object')
+    end
+
+    tests("#head_object('#{@directory.identity}', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      AWS[:storage].head_object(@directory.identity, 'fog_non_object')
+    end
+
+    tests("#delete_object('fognonbucket', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      AWS[:storage].delete_object('fognonbucket', 'fog_non_object')
+    end
+
+  end
+
+  @directory.destroy
+
+end

data/tests/bluebox/requests/compute/block_tests.rb

@@ -1,15 +1,16 @@
 Shindo.tests('Bluebox::Compute | block requests', ['bluebox']) do
 
   @block_format = {
-    'cpu'       => Float,
-    'hostname'  => String,
-    'id'        => String,
-    'ips'       => [{'address' => String}],
-    'memory'    => Integer,
-    'product'   => Bluebox::Compute::Formats::PRODUCT,
-    'status'    => String,
-    'storage'   => Integer,
-    'template'  => String
+    'cpu'         => Float,
+    'description' => String,
+    'hostname'    => String,
+    'id'          => String,
+    'ips'         => [{'address' => String}],
+    'memory'      => Integer,
+    'product'     => Bluebox::Compute::Formats::PRODUCT,
+    'status'      => String,
+    'storage'     => Integer,
+    'template'    => String
   }
 
   tests('success') do
@@ -21,28 +22,37 @@ Shindo.tests('Bluebox::Compute | block requests', ['bluebox']) do
     @block_id = nil
 
     tests("create_block('#{@product_id}', '#{@template_id}', 'password' => '#{@password}')").formats(@block_format) do
+      pending if Fog.mocking?
       data = Bluebox[:compute].create_block(@product_id, @template_id, 'password' => @password).body
       @block_id = data['id']
       data
     end
 
-    Bluebox[:compute].servers.get(@block_id).wait_for { ready? }
+    unless Fog.mocking?
+      Bluebox[:compute].servers.get(@block_id).wait_for { ready? }
+    end
 
     tests("get_block('#{@block_id}')").formats(@block_format) do
+      pending if Fog.mocking?
       Bluebox[:compute].get_block(@block_id).body
     end
 
     tests("get_blocks").formats([@block_format.reject {|key,value| ['product', 'template'].include?(key)}]) do
+      pending if Fog.mocking?
       Bluebox[:compute].get_blocks.body
     end
 
     tests("reboot_block('#{@block_id}')").formats({'status' => String, 'text' => String}) do
+      pending if Fog.mocking?
       Bluebox[:compute].reboot_block(@block_id).body
     end
 
-    Bluebox[:compute].servers.get(@block_id).wait_for { ready? }
+    unless Fog.mocking?
+      Bluebox[:compute].servers.get(@block_id).wait_for { ready? }
+    end
 
     tests("destroy_block('#{@block_id})'").formats({'text' => String}) do
+      pending if Fog.mocking?
       Bluebox[:compute].destroy_block(@block_id).body
     end
 
@@ -51,14 +61,17 @@ Shindo.tests('Bluebox::Compute | block requests', ['bluebox']) do
   tests('failure') do
 
     tests("get_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+      pending if Fog.mocking?
       Bluebox[:compute].get_block('00000000-0000-0000-0000-000000000000')
     end
 
     tests("reboot_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+      pending if Fog.mocking?
       Bluebox[:compute].reboot_block('00000000-0000-0000-0000-000000000000')
     end
 
     tests("destroy_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+      pending if Fog.mocking?
       Bluebox[:compute].destroy_block('00000000-0000-0000-0000-000000000000')
     end
 

data/tests/bluebox/requests/compute/product_tests.rb

@@ -5,10 +5,12 @@ Shindo.tests('Bluebox::Compute | product requests', ['bluebox']) do
     @product_id   = '94fd37a7-2606-47f7-84d5-9000deda52ae' # 1 GB
 
     tests("get_product('#{@product_id}')").formats(Bluebox::Compute::Formats::PRODUCT) do
+      pending if Fog.mocking?
       Bluebox[:compute].get_product(@product_id).body
     end
 
     tests("get_products").formats([Bluebox::Compute::Formats::PRODUCT]) do
+      pending if Fog.mocking?
       Bluebox[:compute].get_products.body
     end
 
@@ -17,6 +19,7 @@ Shindo.tests('Bluebox::Compute | product requests', ['bluebox']) do
   tests('failure') do
 
     tests("get_product('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+      pending if Fog.mocking?
       Bluebox[:compute].get_product('00000000-0000-0000-0000-000000000000')
     end
 

data/tests/bluebox/requests/compute/template_tests.rb

@@ -12,10 +12,12 @@ Shindo.tests('Bluebox::Compute | template requests', ['bluebox']) do
     @template_id  = 'a00baa8f-b5d0-4815-8238-b471c4c4bf72' # Ubuntu 9.10 64bit
 
     tests("get_template('#{@template_id}')").formats(@template_format) do
+      pending if Fog.mocking?
       Bluebox[:compute].get_template(@template_id).body
     end
 
     tests("get_templates").formats([@template_format]) do
+      pending if Fog.mocking?
       Bluebox[:compute].get_templates.body
     end
 
@@ -24,6 +26,7 @@ Shindo.tests('Bluebox::Compute | template requests', ['bluebox']) do
   tests('failure') do
 
     tests("get_template('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+      pending if Fog.mocking?
       Bluebox[:compute].get_template('00000000-0000-0000-0000-000000000000')
     end
 

data/tests/helper.rb

@@ -1,5 +1,5 @@
 require 'fog'
-require 'fog/bin'
+require 'fog/core/bin'
 Fog.bin = true
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'model_helper'))
@@ -16,6 +16,10 @@ end
 FalseClass.send(:include, Fog::Boolean)
 TrueClass.send(:include, Fog::Boolean)
 
+def lorem_file
+  File.open(File.dirname(__FILE__) + '/lorem.txt', 'r')
+end
+
 module Shindo
   class Tests
 

data/tests/linode/requests/compute/datacenter_tests.rb

@@ -10,6 +10,7 @@ Shindo.tests('Linode::Compute | datacenter requests', ['linode']) do
   tests('success') do
 
     tests('#avail_datacenters').formats(@datacenters_format) do
+      pending if Fog.mocking?
       Linode[:compute].avail_datacenters.body
     end
 

data/tests/linode/requests/compute/distribution_tests.rb

@@ -16,12 +16,14 @@ Shindo.tests('Linode::Compute | distribution requests', ['linode']) do
     @distribution_id = nil
 
     tests('#avail_distributions').formats(@distributions_format) do
+      pending if Fog.mocking?
       data = Linode[:compute].avail_distributions.body
       @distribution_id = data['DATA'].first['DISTRIBUTIONID']
       data
     end
 
     tests("@avail_distributions(#{@distribution_id})").formats(@distributions_format) do
+      pending if Fog.mocking?
       Linode[:compute].avail_distributions(@distribution_id).body
     end
 

data/tests/linode/requests/compute/linode_tests.rb

@@ -41,16 +41,19 @@ Shindo.tests('Linode::Compute | linode requests', ['linode']) do
 
     # (2 => Dallas, TX, USA), (1 => 1 month), (1 => Linode 512)
     tests('#linode_create(2, 1, 1)').formats(@linode_format) do
+      pending if Fog.mocking?
       data = Linode[:compute].linode_create(2, 1, 1).body
       @linode_id = data['DATA']['LinodeID']
       data
     end
 
     tests("#linode_list(#{@linode_id})").formats(@linodes_format) do
+      pending if Fog.mocking?
       Linode[:compute].linode_list(@linode_id).body
     end
 
     tests('#linode_list').formats(@linodes_format) do
+      pending if Fog.mocking?
       Linode[:compute].linode_list.body
     end
 
@@ -59,6 +62,7 @@ Shindo.tests('Linode::Compute | linode requests', ['linode']) do
     # end
 
     tests('#linode_delete(#{@linode_id})').succeeds do
+      pending if Fog.mocking?
       Linode[:compute].linode_delete(@linode_id)
     end
 
@@ -67,10 +71,12 @@ Shindo.tests('Linode::Compute | linode requests', ['linode']) do
   tests('failure') do
 
     tests('#linode_reboot(0)').raises(Fog::Linode::Compute::NotFound) do
+      pending if Fog.mocking?
       Linode[:compute].linode_reboot(0)
     end
 
     tests('#linode_delete(0)').raises(Fog::Linode::Compute::NotFound) do
+      pending if Fog.mocking?
       Linode[:compute].linode_delete(0)
     end
 

data/tests/linode/requests/compute/linodeplans_tests.rb

@@ -23,12 +23,14 @@ Shindo.tests('Linode::Compute | linodeplans requests', ['linode']) do
     @linodeplan_id = nil
 
     tests('#avail_linodeplans').formats(@linodeplans_format) do
+      pending if Fog.mocking?
       data = Linode[:compute].avail_linodeplans.body
       @linodeplan_id = data['DATA'].first['PLANID']
       data
     end
 
     tests("#avail_linodeplans(#{@linodeplan_id})").formats(@linodeplans_format) do
+      pending if Fog.mocking?
       Linode[:compute].avail_linodeplans(@linodeplan_id).body
     end
 

data/tests/lorem.txt

@@ -0,0 +1 @@
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

data/tests/rackspace/requests/compute/flavor_tests.rb

@@ -10,14 +10,17 @@ Shindo.tests('Rackspace::Compute | flavor requests', ['rackspace']) do
   tests('success') do
 
     tests('#get_flavor_details(1)').formats(@flavor_format) do
+      pending if Fog.mocking?
       Rackspace[:compute].get_flavor_details(1).body['flavor']
     end
 
     tests('#list_flavors').formats({'flavors' => [Rackspace::Compute::Formats::SUMMARY]}) do
+      pending if Fog.mocking?
       Rackspace[:compute].list_flavors.body
     end
 
     tests('#list_flavors_detail').formats({'flavors' => [@flavor_format]}) do
+      pending if Fog.mocking?
       Rackspace[:compute].list_flavors_detail.body
     end
 
@@ -26,6 +29,7 @@ Shindo.tests('Rackspace::Compute | flavor requests', ['rackspace']) do
   tests('failure') do
 
     tests('#get_flavor_details(0)').raises(Fog::Rackspace::Compute::NotFound) do
+      pending if Fog.mocking?
       Rackspace[:compute].get_flavor_details(0)
     end
 

data/tests/rackspace/requests/compute/image_tests.rb

@@ -4,13 +4,12 @@ Shindo.tests('Rackspace::Compute | image requests', ['rackspace']) do
     'id'        => Integer,
     'name'      => String,
     'status'    => String,
-    'updated'   => String
+    'updated'   => String,
   }
 
   @image_format = @images_format.merge({
     'created'  => String,
     'progress' => Integer,
-    'serverId'  => Integer,
   })
 
   tests('success') do
@@ -19,15 +18,18 @@ Shindo.tests('Rackspace::Compute | image requests', ['rackspace']) do
     @server.wait_for { ready? }
     @image_id = nil
 
-    tests("#create_image(#{@server.id})").formats(@images_format) do
+    tests("#create_image(#{@server.id})").formats(@images_format.merge('serverId' => Integer)) do
       data = Rackspace[:compute].create_image(@server.id).body['image']
       @image_id = data['id']
       data
     end
 
-    Rackspace[:compute].images.get(@image_id).wait_for { ready? }
+    unless Fog.mocking?
+      Rackspace[:compute].images.get(@image_id).wait_for { ready? }
+    end
 
     tests("#get_image_details(#{@image_id})").formats(@image_format) do
+      pending if Fog.mocking?
       Rackspace[:compute].get_image_details(@image_id).body['image']
     end
 
@@ -39,7 +41,12 @@ Shindo.tests('Rackspace::Compute | image requests', ['rackspace']) do
       Rackspace[:compute].list_images_detail.body
     end
 
+    unless Fog.mocking?
+      Rackspace[:compute].images.get(@image_id).wait_for { ready? }
+    end
+
     tests("#delete_image(#{@image_id})").succeeds do
+      pending if Fog.mocking? # because it will fail without the wait just above here, which won't work
       Rackspace[:compute].delete_image(@image_id)
     end
 
@@ -54,6 +61,7 @@ Shindo.tests('Rackspace::Compute | image requests', ['rackspace']) do
     end
 
     tests('#get_image_details(0)').raises(Fog::Rackspace::Compute::NotFound) do
+      pending if Fog.mocking?
       Rackspace[:compute].get_image_details(0)
     end
 

data/tests/rackspace/requests/compute/server_tests.rb

@@ -40,15 +40,23 @@ Shindo.tests('Rackspace::Compute | server requests', ['rackspace']) do
       Rackspace[:compute].list_servers_detail.body
     end
 
+    Rackspace[:compute].servers.get(@server_id).wait_for { ready? }
+
     tests("#update_server(#{@server_id}, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')").succeeds do
       Rackspace[:compute].update_server(@server_id, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
     end
 
+    Rackspace[:compute].servers.get(@server_id).wait_for { ready? }
+
     tests("#reboot_server(#{@server_id}, 'HARD')").succeeds do
+      pending if Fog.mocking?
       Rackspace[:compute].reboot_server(@server_id, 'HARD')
     end
 
+    Rackspace[:compute].servers.get(@server_id).wait_for { ready? }
+
     tests("#reboot_server(#{@server_id}, 'SOFT')").succeeds do
+      pending if Fog.mocking?
       Rackspace[:compute].reboot_server(@server_id, 'SOFT')
     end
 
@@ -75,6 +83,7 @@ Shindo.tests('Rackspace::Compute | server requests', ['rackspace']) do
     end
 
     tests('#reboot_server(0)').raises(Fog::Rackspace::Compute::NotFound) do
+      pending if Fog.mocking?
       Rackspace[:compute].reboot_server(0)
     end
 

data/tests/slicehost/requests/compute/backup_tests.rb

@@ -10,6 +10,7 @@ Shindo.tests('Slicehost::Compute | backup requests', ['slicehost']) do
   tests('success') do
 
     tests('#get_backups').formats({ 'backups' => [@backup_format] }) do
+      pending if Fog.mocking?
       Slicehost[:compute].get_backups.body
     end
 

data/tests/slicehost/requests/compute/flavor_tests.rb

@@ -10,10 +10,12 @@ Shindo.tests('Slicehost::Compute | flavor requests', ['slicehost']) do
   tests('success') do
 
     tests('#get_flavor(1)').formats(@flavor_format) do
+      pending if Fog.mocking?
       Slicehost[:compute].get_flavor(1).body
     end
 
     tests('#get_flavors').formats({ 'flavors' => [@flavor_format] }) do
+      pending if Fog.mocking?
       Slicehost[:compute].get_flavors.body
     end
 
@@ -22,6 +24,7 @@ Shindo.tests('Slicehost::Compute | flavor requests', ['slicehost']) do
   tests('failure') do
 
     tests('#get_flavor(0)').raises(Excon::Errors::Forbidden) do
+      pending if Fog.mocking?
       Slicehost[:compute].get_flavor(0)
     end
 

data/tests/slicehost/requests/compute/image_tests.rb

@@ -8,10 +8,12 @@ Shindo.tests('Slicehost::Compute | image requests', ['slicehost']) do
   tests('success') do
 
     tests('#get_image(19)').formats(@image_format) do
+      pending if Fog.mocking?
       Slicehost[:compute].get_image(19).body
     end
 
     tests('#get_images').formats({ 'images' => [@image_format] }) do
+      pending if Fog.mocking?
       Slicehost[:compute].get_images.body
     end
 
@@ -20,6 +22,7 @@ Shindo.tests('Slicehost::Compute | image requests', ['slicehost']) do
   tests('failure') do
 
     tests('#get_image(0)').raises(Excon::Errors::Forbidden) do
+      pending if Fog.mocking?
       Slicehost[:compute].get_image(0)
     end