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

Now catching errors correctly, all tests succeed

Browse source
This commit is contained in:
Daniel Reichert 2013-07-11 16:46:35 -07:00
parent 002a918b21
commit 42e1b7604d
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/fog/rackspace/monitoring.rb
View file

@ -139,11 +139,15 @@ module Fog
rescue Excon::Errors::HTTPStatusError => error
raise case error
when Excon::Errors::NotFound
Fog::Rackspace::Monitoring::NotFound.slurp(error)
Fog::Rackspace::Monitoring::NotFound.slurp error
else
error
end
end
rescue Excon::Errors::BadRequest => error
raise BadRequest.slurp error
rescue Excon::Errors::NotFound
raise NotFound.slurp error
unless response.body.empty?
response.body = JSON.decode(response.body)
end

16
tests/rackspace/requests/monitoring/entity_tests.rb
View file

@ -20,23 +20,13 @@ Shindo.tests('Fog::Rackspace::Monitoring | entity_tests', ['rackspace','rackspac
response[:status] == 204 ? response : false
end
end
end
__END__
tests('failure') do
tests('#create new entity(-1)').raises(Fog::Rackspace::Monitoring::BadRequest) do
response = account.create_entity(:label => "").data
puts "I made it this far"
pp response
puts "All done now"
account.create_entity(:label => "")
end
tests('#update entity(-1)').raises(Fog::Rackspace::Monitoring::Notfound) do
entity_id = account.create_entity(:label => "Foo").data[:headers]["X-Object-ID"] #setup
tests('#update invalid entity(-1)').raises(Fog::Rackspace::Monitoring::NotFound) do
options = { :testing => "Bar" }
response = account.update_entity(entity_id,options)
puts ""
pp response
account.delete_entity(entity_id) #cleanup
response
response = account.update_entity(-1,options)
end
tests('#delete entity(-1)').raises(Fog::Rackspace::Monitoring::NotFound) do
account.delete_entity(-1)