From e54573070edfc4d3c3fb12880f823e0c0371ac66 Mon Sep 17 00:00:00 2001 From: Rupak Ganguly Date: Tue, 10 Apr 2012 14:56:22 -0400 Subject: [PATCH] Update mocks and tests to simulate real results. --- lib/fog/hp/requests/compute/delete_image.rb | 2 +- tests/hp/requests/compute/image_tests.rb | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/fog/hp/requests/compute/delete_image.rb b/lib/fog/hp/requests/compute/delete_image.rb index 1d7efc308..0664417ef 100644 --- a/lib/fog/hp/requests/compute/delete_image.rb +++ b/lib/fog/hp/requests/compute/delete_image.rb @@ -33,7 +33,7 @@ module Fog end response else - response.status = 400 + response.status = 500 raise(Excon::Errors.status_error({:expects => 202}, response)) end diff --git a/tests/hp/requests/compute/image_tests.rb b/tests/hp/requests/compute/image_tests.rb index a80fd97cb..c956287b0 100644 --- a/tests/hp/requests/compute/image_tests.rb +++ b/tests/hp/requests/compute/image_tests.rb @@ -2,8 +2,9 @@ Shindo.tests('Fog::Compute[:hp] | image requests', ['hp']) do @image_format = { 'id' => String, - 'links' => Array, + 'links' => [Hash], 'metadata' => Fog::Nullable::Hash, + 'server' => Fog::Nullable::Hash, 'name' => String, 'progress' => Fog::Nullable::Integer, 'status' => String, @@ -13,13 +14,16 @@ Shindo.tests('Fog::Compute[:hp] | image requests', ['hp']) do @list_images_format = { 'id' => String, + 'links' => Fog::Nullable::Array, 'name' => String } + @base_image_id = 128 #1242 + tests('success') do @server_name = "fogservertest" @image_name = "fogimagetest" - @server = Fog::Compute[:hp].servers.create(:name => @server_name, :flavor_id => 100, :image_id => 1242) + @server = Fog::Compute[:hp].servers.create(:name => @server_name, :flavor_id => 100, :image_id => @base_image_id) @server.wait_for { ready? } @image_id = nil @@ -62,7 +66,7 @@ Shindo.tests('Fog::Compute[:hp] | image requests', ['hp']) do tests('failure') do - tests('#delete_image(0)').raises(Excon::Errors::BadRequest) do + tests('#delete_image(0)').raises(Excon::Errors::InternalServerError) do Fog::Compute[:hp].delete_image(0) end