kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[local|storage] fixes for pending mocked tests

Browse source
This commit is contained in:
geemus 2011-05-24 17:32:27 -07:00
parent d7ae0956be
commit ca360be0ed
6 changed files with 36 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/helpers/mock_helper.rb
View file

@ -25,7 +25,7 @@ if Fog.mock?
:google_storage_access_key_id => 'google_storage_access_key_id',
:google_storage_secret_access_key => 'google_storage_secret_access_key',
:linode_api_key => 'linode_api_key',
# :local_root => '~/.fog'
:local_root => '~/.fog',
:new_servers_password => 'new_servers_password',
:new_servers_username => 'new_servers_username',
# :public_key_path => '~/.ssh/id_rsa.pub',

2
tests/storage/helper.rb
View file

@ -7,7 +7,7 @@ def storage_providers
:mocked => true
},
Local => {
:mocked => true
:mocked => false
},
Rackspace => {
:mocked => false

4
tests/storage/models/directories_tests.rb
View file

@ -2,6 +2,8 @@ for provider, config in storage_providers
Shindo.tests("#{provider}::Storage | directories", [provider.to_s.downcase]) do
if !Fog.mocking? || config[:mocked]
directory_attributes = {
:key => 'fogdirectoriestests',
}.merge!(config[:directory_attributes] || {})
@ -10,4 +12,6 @@ for provider, config in storage_providers
end
end
end

4
tests/storage/models/directory_test.rb
View file

@ -2,6 +2,8 @@ for provider, config in storage_providers
Shindo.tests("#{provider}::Storage | directory", [provider.to_s.downcase]) do
if !Fog.mocking? || config[:mocked]
directory_attributes = {
:key => 'fogdirectorytests'
}.merge!(config[:directory_attributes] || {})
@ -22,4 +24,6 @@ for provider, config in storage_providers
end
end
end

4
tests/storage/models/file_tests.rb
View file

@ -2,14 +2,14 @@ for provider, config in storage_providers
Shindo.tests("#{provider}::Storage | file", [provider.to_s.downcase]) do
if !Fog.mocking? || config[:mocked]
file_attributes = {
:key => 'fog_file_tests',
:body => lorem_file,
:public => true
}.merge!(config[:file_attributes] || {})
if !Fog.mocking? || config[:mocked]
directory_attributes = {
:key => 'fogfilestests'
}.merge!(config[:directory_attributes] || {})

4
tests/storage/models/files_tests.rb
View file

@ -2,13 +2,13 @@ for provider, config in storage_providers
Shindo.tests("#{provider}::Storage | files", [provider.to_s.downcase]) do
if !Fog.mocking? || config[:mocked]
file_attributes = {
:key => 'fog_files_tests',
:body => lorem_file
}.merge!(config[:file_attributes] || {})
if !Fog.mocking? || config[:mocked]
directory_attributes = {
:key => 'fogfilestests'
}.merge!(config[:directory_attributes] || {})