[rackspace] fixing broken tests
This commit is contained in:
parent
53bab93b71
commit
5c0743bfa8
|
@ -6,6 +6,10 @@ module Fog
|
||||||
class Rackspace < Fog::Service
|
class Rackspace < Fog::Service
|
||||||
include Fog::Rackspace::Errors
|
include Fog::Rackspace::Errors
|
||||||
|
|
||||||
|
class ServiceError < Fog::Rackspace::Errors::ServiceError; end
|
||||||
|
class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
|
||||||
|
class BadRequest < Fog::Rackspace::Errors::BadRequest; end
|
||||||
|
|
||||||
requires :rackspace_api_key, :rackspace_username
|
requires :rackspace_api_key, :rackspace_username
|
||||||
recognizes :rackspace_auth_url, :rackspace_servicenet, :persistent
|
recognizes :rackspace_auth_url, :rackspace_servicenet, :persistent
|
||||||
recognizes :rackspace_auth_token, :rackspace_management_url, :rackspace_compute_v1_url, :rackspace_region
|
recognizes :rackspace_auth_token, :rackspace_management_url, :rackspace_compute_v1_url, :rackspace_region
|
||||||
|
|
|
@ -106,7 +106,11 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server_tests', ['rackspace']) do
|
||||||
sleep 120 unless Fog.mocking?
|
sleep 120 unless Fog.mocking?
|
||||||
|
|
||||||
tests('#resize_server').succeeds do
|
tests('#resize_server').succeeds do
|
||||||
resize_flavor_id = flavor_id
|
if Fog.mocking?
|
||||||
|
resize_flavor_id = flavor_id
|
||||||
|
else
|
||||||
|
resize_flavor_id = service.flavors[1]
|
||||||
|
end
|
||||||
service.resize_server(server_id, resize_flavor_id)
|
service.resize_server(server_id, resize_flavor_id)
|
||||||
end
|
end
|
||||||
wait_for_server_state(service, server_id, 'VERIFY_RESIZE', 'ACTIVE')
|
wait_for_server_state(service, server_id, 'VERIFY_RESIZE', 'ACTIVE')
|
||||||
|
|
|
@ -304,12 +304,20 @@ Shindo.tests('Fog::Storage[:rackspace] | large object requests', ['rackspace'])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
tests('#delete_static_large_object with missing container').raises(Fog::Storage::Rackspace::NotFound) do
|
tests('#delete_static_large_object with missing container') do
|
||||||
Fog::Storage[:rackspace].delete_static_large_object('fognoncontainer', 'fog_large_object')
|
response = Fog::Storage[:rackspace].delete_static_large_object('fognoncontainer', 'fog_large_object')
|
||||||
|
returns(200) { response.status }
|
||||||
|
returns(0) { response.body["Number Not Found"] }
|
||||||
|
returns("400 Bad Request") { response.body["Response Status"]}
|
||||||
|
returns("Invalid bulk delete.") { response.body["Response Body"]}
|
||||||
end
|
end
|
||||||
|
|
||||||
tests('#delete_static_large_object with missing manifest').raises(Fog::Storage::Rackspace::NotFound) do
|
tests('#delete_static_large_object with missing manifest') do
|
||||||
Fog::Storage[:rackspace].delete_static_large_object(@directory.identity, 'fog_non_object')
|
response = Fog::Storage[:rackspace].delete_static_large_object(@directory.identity, 'fog_non_object')
|
||||||
|
returns(200) { response.status }
|
||||||
|
returns(0) { response.body["Number Not Found"] }
|
||||||
|
returns("400 Bad Request") { response.body["Response Status"]}
|
||||||
|
returns("Invalid bulk delete.") { response.body["Response Body"]}
|
||||||
end
|
end
|
||||||
|
|
||||||
tests('#delete_static_large_object with missing segment') do
|
tests('#delete_static_large_object with missing segment') do
|
||||||
|
|
Loading…
Reference in New Issue