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

[digitalocean|compute] fix merge conflict in fog_test_server_attributes

Browse source
This commit is contained in:
Dave Donahue 2014-01-05 19:44:07 -05:00
parent 404af09125
commit 7d67e9726c
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/digitalocean/helper.rb
View file

@ -5,15 +5,10 @@ def service
end end
def fog_test_server_attributes def fog_test_server_attributes
<<<<<<< HEAD
image = service.images.find { |i| i.name == 'Ubuntu 13.10 x64' }
=======
# Hard coding numbers because requests from tests are sometimes failing. # Hard coding numbers because requests from tests are sometimes failing.
# TODO: Mock properly instead # TODO: Mock properly instead
image = service.images.find { |i| i.name == 'Ubuntu 13.10 x64' } image = service.images.find { |i| i.name == 'Ubuntu 13.10 x64' }
image_id = image.nil? ? 1505447 : image.id image_id = image.nil? ? 1505447 : image.id
>>>>>>> master
region = service.regions.find { |r| r.name == 'New York 1' } region = service.regions.find { |r| r.name == 'New York 1' }
region_id = region.nil? ? 4 : region.id region_id = region.nil? ? 4 : region.id
flavor = service.flavors.find { |r| r.name == '512MB' } flavor = service.flavors.find { |r| r.name == '512MB' }