From c0bc793ccb8beea68f2b5547324e838dec16ad86 Mon Sep 17 00:00:00 2001 From: Kevin Chan Date: Wed, 22 Feb 2012 17:37:55 -0800 Subject: [PATCH] Cleanups + Fixes #get_machine test breaking when there are no machines --- tests/joyent/requests/compute/keys_tests.rb | 2 +- tests/joyent/requests/compute/machines_tests.rb | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/joyent/requests/compute/keys_tests.rb b/tests/joyent/requests/compute/keys_tests.rb index e2ad64be9..a19ab8315 100644 --- a/tests/joyent/requests/compute/keys_tests.rb +++ b/tests/joyent/requests/compute/keys_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Fog::Compute::Joyent | key requests", ['joyent']) do +Shindo.tests("Fog::Compute[:joyent] | key requests", ['joyent']) do @key_format = { "name" => String, diff --git a/tests/joyent/requests/compute/machines_tests.rb b/tests/joyent/requests/compute/machines_tests.rb index 5256d7a51..3d2325c52 100644 --- a/tests/joyent/requests/compute/machines_tests.rb +++ b/tests/joyent/requests/compute/machines_tests.rb @@ -56,9 +56,12 @@ Shindo.tests("Fog::Compute[:joyent] | machine requests", ["joyent"]) do # https://us-west-1.api.joyentcloud.com/docs#GetMachine tests("#get_machine") do - formats(@machine_format) do - id = @provider.list_machines.body.first["id"] - @provider.get_machine(id).body + machines = @provider.list_machines.body + unless machines.empty? + formats(@machine_format) do + id = machines.first["id"] + @provider.get_machine(id).body + end end end end