From b1473b39f561ef8fda9e0fb8f36cdd16518d0c52 Mon Sep 17 00:00:00 2001 From: geemus Date: Tue, 16 Nov 2010 15:31:34 -0800 Subject: [PATCH] fixing misc recently introduced spec/test bugs --- Gemfile.lock | 4 ++-- fog.gemspec | 2 +- lib/fog/core/service.rb | 9 ++++++--- lib/fog/google/requests/storage/get_bucket.rb | 1 - spec/aws/models/compute/server_spec.rb | 1 - tests/bluebox/models/compute/flavors_tests.rb | 2 +- tests/bluebox/models/compute/server_tests.rb | 2 +- tests/bluebox/models/compute/servers_tests.rb | 2 +- tests/helpers/collection_tests.rb | 4 ++-- tests/helpers/compute/flavors_tests.rb | 2 +- tests/helpers/compute/servers_tests.rb | 2 +- tests/helpers/model_tests.rb | 2 +- tests/helpers/storage/directories_tests.rb | 4 +++- tests/helpers/storage/directory_tests.rb | 9 +++++++-- tests/helpers/storage/file_tests.rb | 16 ++++++++-------- tests/helpers/storage/files_tests.rb | 8 ++++---- tests/local/models/storage/directories_tests.rb | 2 +- tests/local/models/storage/directory_tests.rb | 2 +- tests/local/models/storage/file_tests.rb | 2 +- tests/local/models/storage/files_tests.rb | 2 +- tests/rackspace/models/compute/flavors_tests.rb | 2 +- .../models/storage/directories_tests.rb | 2 +- .../rackspace/models/storage/directory_tests.rb | 2 +- tests/rackspace/models/storage/file_tests.rb | 2 +- tests/rackspace/models/storage/files_tests.rb | 2 +- tests/slicehost/models/compute/flavors_tests.rb | 2 +- tests/slicehost/models/compute/server_tests.rb | 2 +- tests/slicehost/models/compute/servers_tests.rb | 2 +- 28 files changed, 51 insertions(+), 43 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3e1f53c3c..0e6ce4dad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,7 +26,7 @@ GEM rake (0.8.7) rspec (1.3.1) ruby-hmac (0.4.0) - shindo (0.1.8) + shindo (0.1.9) formatador (>= 0.0.14) gestalt (>= 0.0.11) @@ -45,4 +45,4 @@ DEPENDENCIES rake rspec (= 1.3.1) ruby-hmac - shindo (= 0.1.8) + shindo (= 0.1.9) diff --git a/fog.gemspec b/fog.gemspec index 5e0d6ecf4..f526c0438 100644 --- a/fog.gemspec +++ b/fog.gemspec @@ -55,7 +55,7 @@ Gem::Specification.new do |s| ## those that are only needed during development s.add_development_dependency('rake') s.add_development_dependency('rspec', '1.3.1') - s.add_development_dependency('shindo', '0.1.8') + s.add_development_dependency('shindo', '0.1.9') ## Leave this section as-is. It will be automatically generated from the ## contents of your Git repository via the gemspec task. DO NOT REMOVE diff --git a/lib/fog/core/service.rb b/lib/fog/core/service.rb index a6a0a990f..2a90aa020 100644 --- a/lib/fog/core/service.rb +++ b/lib/fog/core/service.rb @@ -136,9 +136,12 @@ module Fog raise ArgumentError, "Missing required arguments: #{missing.join(', ')}" end - unrecognized = options.keys - requirements - recognized - unless unrecognized.empty? - raise ArgumentError, "Unrecognized arguments: #{unrecognized.join(', ')}" + # FIXME: avoid failing for the services that don't have recognizes yet + unless recognizes.empty? + unrecognized = options.keys - requirements - recognized + unless unrecognized.empty? + raise ArgumentError, "Unrecognized arguments: #{unrecognized.join(', ')}" + end end end diff --git a/lib/fog/google/requests/storage/get_bucket.rb b/lib/fog/google/requests/storage/get_bucket.rb index 830479abb..a68c1ede1 100644 --- a/lib/fog/google/requests/storage/get_bucket.rb +++ b/lib/fog/google/requests/storage/get_bucket.rb @@ -85,7 +85,6 @@ module Fog 'Contents' => truncated_contents, 'IsTruncated' => truncated_contents.size != contents.size, 'Marker' => options['marker'], - 'MaxKeys' => max_keys, 'Name' => bucket['Name'], 'Prefix' => options['prefix'] } diff --git a/spec/aws/models/compute/server_spec.rb b/spec/aws/models/compute/server_spec.rb index 74db22d85..41a6242f1 100644 --- a/spec/aws/models/compute/server_spec.rb +++ b/spec/aws/models/compute/server_spec.rb @@ -1,5 +1,4 @@ require File.dirname(__FILE__) + '/../../../spec_helper' -require File.dirname(__FILE__) + '/../../../shared_examples/server_examples' describe 'Fog::AWS::Compute::Server' do diff --git a/tests/bluebox/models/compute/flavors_tests.rb b/tests/bluebox/models/compute/flavors_tests.rb index 9587108c5..f702a259f 100644 --- a/tests/bluebox/models/compute/flavors_tests.rb +++ b/tests/bluebox/models/compute/flavors_tests.rb @@ -1,5 +1,5 @@ Shindo.tests('Bluebox::Compute | flavors collection', ['bluebox']) do - flavors_tests(Bluebox[:compute]) + flavors_tests(Bluebox[:compute], {}, false) end diff --git a/tests/bluebox/models/compute/server_tests.rb b/tests/bluebox/models/compute/server_tests.rb index f6c5fc514..412456051 100644 --- a/tests/bluebox/models/compute/server_tests.rb +++ b/tests/bluebox/models/compute/server_tests.rb @@ -1,5 +1,5 @@ Shindo.tests('Bluebox::Compute | server model', ['bluebox']) do - server_tests(Bluebox[:compute], {:image_id => 'a00baa8f-b5d0-4815-8238-b471c4c4bf72'}) + server_tests(Bluebox[:compute], {:image_id => 'a00baa8f-b5d0-4815-8238-b471c4c4bf72'}, false) end diff --git a/tests/bluebox/models/compute/servers_tests.rb b/tests/bluebox/models/compute/servers_tests.rb index 7b167c8a7..2f04d932a 100644 --- a/tests/bluebox/models/compute/servers_tests.rb +++ b/tests/bluebox/models/compute/servers_tests.rb @@ -1,6 +1,6 @@ Shindo.tests('Bluebox::Compute | servers collection', ['bluebox']) do # Ubuntu 9.10 64bit - servers_tests(Bluebox[:compute], {:image_id => 'a00baa8f-b5d0-4815-8238-b471c4c4bf72'}) + servers_tests(Bluebox[:compute], {:image_id => 'a00baa8f-b5d0-4815-8238-b471c4c4bf72'}, false) end diff --git a/tests/helpers/collection_tests.rb b/tests/helpers/collection_tests.rb index 8fc4ba9fe..7c731ba5f 100644 --- a/tests/helpers/collection_tests.rb +++ b/tests/helpers/collection_tests.rb @@ -1,4 +1,4 @@ -def collection_tests(collection, params, mocks_implemented = true) +def collection_tests(collection, params = {}, mocks_implemented = true) tests('success') do @@ -38,7 +38,7 @@ def collection_tests(collection, params, mocks_implemented = true) tests('failure') do if !Fog.mocking? || mocks_implemented - @identity = @identity.gsub(/\w/, '0') + @identity = @identity.to_s.gsub(/\w/, '0') end tests("#get('#{@identity}')").returns(nil) do diff --git a/tests/helpers/compute/flavors_tests.rb b/tests/helpers/compute/flavors_tests.rb index 5c9baabfe..11b98a3a6 100644 --- a/tests/helpers/compute/flavors_tests.rb +++ b/tests/helpers/compute/flavors_tests.rb @@ -21,7 +21,7 @@ def flavors_tests(connection, params = {}, mocks_implemented = true) tests('failure') do if !Fog.mocking? || mocks_implemented - invalid_flavor_identity = connection.flavors.first.identity.gsub(/\w/, '0') + invalid_flavor_identity = connection.flavors.first.identity.to_s.gsub(/\w/, '0') end tests("#get('#{invalid_flavor_identity}')").returns(nil) do diff --git a/tests/helpers/compute/servers_tests.rb b/tests/helpers/compute/servers_tests.rb index 8c8a56872..643a1233f 100644 --- a/tests/helpers/compute/servers_tests.rb +++ b/tests/helpers/compute/servers_tests.rb @@ -1,4 +1,4 @@ -def servers_tests(connection, params, mocks_implemented = true) +def servers_tests(connection, params = {}, mocks_implemented = true) collection_tests(connection.servers, params, mocks_implemented) do diff --git a/tests/helpers/model_tests.rb b/tests/helpers/model_tests.rb index fdbb2b620..bda1fbf51 100644 --- a/tests/helpers/model_tests.rb +++ b/tests/helpers/model_tests.rb @@ -1,4 +1,4 @@ -def model_tests(collection, params, mocks_implemented = true) +def model_tests(collection, params = {}, mocks_implemented = true) tests('success') do diff --git a/tests/helpers/storage/directories_tests.rb b/tests/helpers/storage/directories_tests.rb index 043e7f7f0..5b8b2c808 100644 --- a/tests/helpers/storage/directories_tests.rb +++ b/tests/helpers/storage/directories_tests.rb @@ -1,4 +1,6 @@ -def directories_tests(connection, params = {:key => 'fogdirectoriestests'}, mocks_implemented = true) +def directories_tests(connection, params = {}, mocks_implemented = true) + + params = {:key => 'fogdirectoriestests'}.merge!(params) collection_tests(connection.directories, params, mocks_implemented) diff --git a/tests/helpers/storage/directory_tests.rb b/tests/helpers/storage/directory_tests.rb index d577c7ebe..f5299f35f 100644 --- a/tests/helpers/storage/directory_tests.rb +++ b/tests/helpers/storage/directory_tests.rb @@ -1,12 +1,17 @@ -def directory_tests(connection, params = {:key => 'fogdirectorytests'}, mocks_implemented = true) +def directory_tests(connection, params = {}, mocks_implemented = true) + + params = {:key => 'fogdirectorytests'}.merge!(params) model_tests(connection.directories, params, mocks_implemented) do tests("#public=(true)").succeeds do + pending if Fog.mocking? && !mocks_implemented @instance.public=(true) end - responds_to(:public_url) + if !Fog.mocking? || mocks_implemented + responds_to(:public_url) + end end diff --git a/tests/helpers/storage/file_tests.rb b/tests/helpers/storage/file_tests.rb index 5ccb7bfc5..a4bf2e888 100644 --- a/tests/helpers/storage/file_tests.rb +++ b/tests/helpers/storage/file_tests.rb @@ -1,18 +1,18 @@ -def file_tests(connection, params = {:key => 'fog_file_tests', :body => lorem_file}, mocks_implemented = true) +def file_tests(connection, params = {}, mocks_implemented = true) + + params = {:key => 'fog_file_tests', :body => lorem_file}.merge!(params) if !Fog.mocking? || mocks_implemented @directory = connection.directories.create(:key => 'fogfilestests') - end - model_tests(@directory.files, params, mocks_implemented) do + model_tests(@directory.files, params, mocks_implemented) do + + tests("#respond_to?(:public_url)").succeeds do + @instance.respond_to?(:public_url) + end - tests("#respond_to?(:public_url)").succeeds do - @instance.respond_to?(:public_url) end - end - - if !Fog.mocking? || mocks_implemented @directory.destroy end diff --git a/tests/helpers/storage/files_tests.rb b/tests/helpers/storage/files_tests.rb index bf767078e..32594651c 100644 --- a/tests/helpers/storage/files_tests.rb +++ b/tests/helpers/storage/files_tests.rb @@ -1,12 +1,12 @@ -def files_tests(connection, params = {:key => 'fog_files_tests', :body => lorem_file}, mocks_implemented = true) +def files_tests(connection, params = {}, mocks_implemented = true) + + params = {:key => 'fog_files_tests', :body => lorem_file}.merge!(params) if !Fog.mocking? || mocks_implemented @directory = connection.directories.create(:key => 'fogfilestests') - end - collection_tests(@directory.files, params, mocks_implemented) + collection_tests(@directory.files, params, mocks_implemented) - if !Fog.mocking? || mocks_implemented @directory.destroy end diff --git a/tests/local/models/storage/directories_tests.rb b/tests/local/models/storage/directories_tests.rb index dd60e611c..9f50ae2fe 100644 --- a/tests/local/models/storage/directories_tests.rb +++ b/tests/local/models/storage/directories_tests.rb @@ -1,5 +1,5 @@ Shindo.tests('Local::Storage | directories collection', ['local']) do - directories_tests(Local[:storage], false) + directories_tests(Local[:storage], {}, false) end \ No newline at end of file diff --git a/tests/local/models/storage/directory_tests.rb b/tests/local/models/storage/directory_tests.rb index a6bf28c82..7bfa957ca 100644 --- a/tests/local/models/storage/directory_tests.rb +++ b/tests/local/models/storage/directory_tests.rb @@ -1,5 +1,5 @@ Shindo.tests('Local::Storage | directory model', ['local']) do - directory_tests(Local[:storage], false) + directory_tests(Local[:storage], {}, false) end \ No newline at end of file diff --git a/tests/local/models/storage/file_tests.rb b/tests/local/models/storage/file_tests.rb index cef5889d6..2bef2f9bb 100644 --- a/tests/local/models/storage/file_tests.rb +++ b/tests/local/models/storage/file_tests.rb @@ -1,5 +1,5 @@ Shindo.tests('Local::Storage | file model', ['local']) do - file_tests(Local[:storage], false) + file_tests(Local[:storage], {}, false) end \ No newline at end of file diff --git a/tests/local/models/storage/files_tests.rb b/tests/local/models/storage/files_tests.rb index e734fa1f7..17695df04 100644 --- a/tests/local/models/storage/files_tests.rb +++ b/tests/local/models/storage/files_tests.rb @@ -1,5 +1,5 @@ Shindo.tests('Local::Storage | files collection', ['local']) do - files_tests(Local[:storage], false) + files_tests(Local[:storage], {}, false) end \ No newline at end of file diff --git a/tests/rackspace/models/compute/flavors_tests.rb b/tests/rackspace/models/compute/flavors_tests.rb index c841fa327..12bc68b23 100644 --- a/tests/rackspace/models/compute/flavors_tests.rb +++ b/tests/rackspace/models/compute/flavors_tests.rb @@ -1,5 +1,5 @@ Shindo.tests('Rackspace::Compute | flavors collection', ['rackspace']) do - flavors_tests(Rackspace[:compute]) + flavors_tests(Rackspace[:compute], {}, false) end diff --git a/tests/rackspace/models/storage/directories_tests.rb b/tests/rackspace/models/storage/directories_tests.rb index 67cb2d147..7c95611df 100644 --- a/tests/rackspace/models/storage/directories_tests.rb +++ b/tests/rackspace/models/storage/directories_tests.rb @@ -1,5 +1,5 @@ Shindo.tests('Rackspace::Storage | directories collection', ['rackspace']) do - directories_tests(Rackspace[:storage], false) + directories_tests(Rackspace[:storage], {}, false) end diff --git a/tests/rackspace/models/storage/directory_tests.rb b/tests/rackspace/models/storage/directory_tests.rb index bd7d8fa42..80dbae618 100644 --- a/tests/rackspace/models/storage/directory_tests.rb +++ b/tests/rackspace/models/storage/directory_tests.rb @@ -1,5 +1,5 @@ Shindo.tests('Rackspace::Storage | directory model', ['rackspace']) do - directory_tests(Rackspace[:storage], false) + directory_tests(Rackspace[:storage], {}, false) end diff --git a/tests/rackspace/models/storage/file_tests.rb b/tests/rackspace/models/storage/file_tests.rb index 6155bfb50..cabf67a25 100644 --- a/tests/rackspace/models/storage/file_tests.rb +++ b/tests/rackspace/models/storage/file_tests.rb @@ -1,5 +1,5 @@ Shindo.tests('Rackspace::Storage | file model', ['rackspace']) do - file_tests(Rackspace[:storage], false) + file_tests(Rackspace[:storage], {}, false) end diff --git a/tests/rackspace/models/storage/files_tests.rb b/tests/rackspace/models/storage/files_tests.rb index b16b01158..445392822 100644 --- a/tests/rackspace/models/storage/files_tests.rb +++ b/tests/rackspace/models/storage/files_tests.rb @@ -1,5 +1,5 @@ Shindo.tests('Rackspace::Storage | files collection', ['rackspace']) do - files_tests(Rackspace[:storage], false) + files_tests(Rackspace[:storage], {}, false) end diff --git a/tests/slicehost/models/compute/flavors_tests.rb b/tests/slicehost/models/compute/flavors_tests.rb index 593531f33..8ced27d7f 100644 --- a/tests/slicehost/models/compute/flavors_tests.rb +++ b/tests/slicehost/models/compute/flavors_tests.rb @@ -1,5 +1,5 @@ Shindo.tests('Slicehost::Compute | flavors collection', ['slicehost']) do - flavors_tests(Slicehost[:compute]) + flavors_tests(Slicehost[:compute], {}, false) end diff --git a/tests/slicehost/models/compute/server_tests.rb b/tests/slicehost/models/compute/server_tests.rb index 9710b4bc6..881fa18bc 100644 --- a/tests/slicehost/models/compute/server_tests.rb +++ b/tests/slicehost/models/compute/server_tests.rb @@ -1,6 +1,6 @@ Shindo.tests('Slicehost::Compute | server model', ['slicehost']) do # image 49 = Ubuntu 10.04 LTS (lucid) - server_tests(Slicehost[:compute], {:image_id => 49, :name => "fog_#{Time.now.to_i}") + server_tests(Slicehost[:compute], {:image_id => 49, :name => "fog_#{Time.now.to_i}"}, false) end diff --git a/tests/slicehost/models/compute/servers_tests.rb b/tests/slicehost/models/compute/servers_tests.rb index 120885ced..852066459 100644 --- a/tests/slicehost/models/compute/servers_tests.rb +++ b/tests/slicehost/models/compute/servers_tests.rb @@ -1,6 +1,6 @@ Shindo.tests('Slicehost::Compute | servers collection', ['slicehost']) do # image 49 = Ubuntu 10.04 LTS (lucid) - servers_tests(Slicehost[:compute], {:image_id => 49, :name => "fog_#{Time.now.to_i}"}) + servers_tests(Slicehost[:compute], {:image_id => 49, :name => "fog_#{Time.now.to_i}"}, false) end