mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
disable mock running, I think.
This commit is contained in:
parent
567f363dcb
commit
354da67793
2 changed files with 17 additions and 3 deletions
|
@ -45,6 +45,19 @@ module Google # deviates from other bin stuff to accomodate gem
|
|||
!Gem.source_index.find_name('google-api-client').empty? # legacy
|
||||
end
|
||||
|
||||
# Then make sure we have all of the requirements
|
||||
for service in services
|
||||
begin
|
||||
service = self.class_for(service)
|
||||
availability &&= service.requirements.all? { |requirement| Fog.credentials.include?(requirement) }
|
||||
rescue ArgumentError => e
|
||||
Fog::Logger.warning(e.message)
|
||||
availability = false
|
||||
rescue => e
|
||||
availability = false
|
||||
end
|
||||
end
|
||||
|
||||
if availability
|
||||
for service in services
|
||||
for collection in self.class_for(service).collections
|
||||
|
|
|
@ -39,11 +39,12 @@ if Fog.mock?
|
|||
:glesys_api_key => 'glesys_api_key',
|
||||
:go_grid_api_key => 'go_grid_api_key',
|
||||
:go_grid_shared_secret => 'go_grid_shared_secret',
|
||||
:google_project => 'google_project_name',
|
||||
:google_storage_access_key_id => 'google_storage_access_key_id',
|
||||
:google_storage_secret_access_key => 'google_storage_secret_access_key',
|
||||
:google_client_email => 'fake@developer.gserviceaccount.com',
|
||||
:google_key_location => '~/fake.p12',
|
||||
# Commented out till there are mocks for google/compute
|
||||
#:google_project => 'google_project_name',
|
||||
#:google_client_email => 'fake@developer.gserviceaccount.com',
|
||||
#:google_key_location => '~/fake.p12',
|
||||
:hp_access_key => 'hp_access_key',
|
||||
:hp_secret_key => 'hp_secret_key',
|
||||
:hp_tenant_id => 'hp_tenant_id',
|
||||
|
|
Loading…
Reference in a new issue