mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
trying to get a simple model test working.
This commit is contained in:
parent
7a8a429702
commit
4308d7d627
3 changed files with 33 additions and 23 deletions
|
@ -14,8 +14,16 @@ module Fog
|
|||
load(data)
|
||||
end
|
||||
|
||||
def get(identity)
|
||||
data = service.get_server(identity).body
|
||||
def get(identity, zone=nil)
|
||||
data = nil
|
||||
if zone.nil?
|
||||
service.list_zones.body['items'].each do |zone|
|
||||
data = service.get_server(identity, zone['name']).body
|
||||
break if data["code"] == 200
|
||||
end
|
||||
else
|
||||
data = service.get_server(identity, zone).body
|
||||
end
|
||||
new(data)
|
||||
rescue Excon::Errors::NotFound
|
||||
nil
|
||||
|
|
15
tests/google/models/compute/server_tests.rb
Normal file
15
tests/google/models/compute/server_tests.rb
Normal file
|
@ -0,0 +1,15 @@
|
|||
Shindo.tests("Fog::Compute[:google] | server model", ['google']) do
|
||||
|
||||
tests('bootstrap') do
|
||||
@instance = Fog::Compute[:google].servers.bootstrap
|
||||
|
||||
test('#ready?') do
|
||||
@insance.ready?
|
||||
end
|
||||
|
||||
test('#destroy') do
|
||||
@instance.destroy
|
||||
end
|
||||
|
||||
end
|
||||
end
|
|
@ -67,31 +67,18 @@ Shindo.tests('Fog::Compute[:google] | server requests', ['google']) do
|
|||
).body
|
||||
end
|
||||
|
||||
tests("#get_server").formats(@get_server_format) do
|
||||
@google.insert_server(
|
||||
server_name,
|
||||
image_name,
|
||||
zone_name,
|
||||
machine_type
|
||||
)
|
||||
|
||||
@google.get_server(server_name, zone_name).body
|
||||
end
|
||||
|
||||
tests("#list_servers").formats(@list_servers_format) do
|
||||
@google.list_servers(zone_name).body
|
||||
end
|
||||
|
||||
tests("#delete_server").formats(@delete_server_format) do
|
||||
@google.insert_server(
|
||||
server_name,
|
||||
image_name,
|
||||
zone_name,
|
||||
machine_type
|
||||
)
|
||||
@google.delete_server(server_name, zone_name).body
|
||||
end
|
||||
# Both of these tests require the server to be there...
|
||||
|
||||
#tests("#get_server").formats(@get_server_format) do
|
||||
# @google.get_server(server_name, zone_name).body
|
||||
#end
|
||||
|
||||
#tests("#delete_server").formats(@delete_server_format) do
|
||||
# @google.delete_server(server_name, zone_name).body
|
||||
#end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Add table
Reference in a new issue