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

[vcloud_director] Minor test cleanups.

Browse source
This commit is contained in:
Nick Osborn 2013-10-16 00:26:29 +01:00
parent e50b86efee
commit 74b6dfc902
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tests/vcloud_director/requests/compute/media_tests.rb
View file

@ -6,16 +6,17 @@ Shindo.tests('Compute::VcloudDirector | media requests', ['vclouddirector']) do
tests('Upload and manipulate a media object') do
pending if Fog.mocking?
File.open(VcloudDirector::Compute::Helper.fixture('test.iso'), 'rb') do |iso|
tests('#post_upload_media').data_matches_schema(VcloudDirector::Compute::Schema::MEDIA_TYPE) do
pending if Fog.mocking?
@vdc_id = VcloudDirector::Compute::Helper.first_vdc_id(@org)
@media = @service.post_upload_media(@vdc_id, @media_name, 'iso', iso.size).body
end
file = @media[:Files][:File]
file[:Link] = [file[:Link]] if file[:Link].is_a?(Hash)
link = file[:Link].detect {|l| l[:rel] == 'upload:default'}
tests('media object has an upload link').returns(true) do
@link = @media[:Files][:File][:Link]
@link[:rel] == 'upload:default'
end
headers = {
'Content-Length' => iso.size,
@ -23,14 +24,13 @@ Shindo.tests('Compute::VcloudDirector | media requests', ['vclouddirector']) do
'x-vcloud-authorization' => @service.vcloud_token
}
Excon.put(
link[:href], :body => iso.read, :expects => 200, :headers => headers
@link[:href], :body => iso.read, :expects => 200, :headers => headers
)
@service.process_task(@media[:Tasks][:Task])
@media_id = @media[:href].split('/').last
tests("#get_media(#{@media_id})").data_matches_schema(VcloudDirector::Compute::Schema::MEDIA_TYPE) do
pending if Fog.mocking?
@media = @service.get_media(@media_id).body
end
tests("media[:name]").returns(@media_name) { @media[:name] }
@ -38,19 +38,16 @@ Shindo.tests('Compute::VcloudDirector | media requests', ['vclouddirector']) do
tests("media[:size]").returns(iso.size) { @media[:size].to_i }
tests("#get_media_owner(#{@media_id})").data_matches_schema(VcloudDirector::Compute::Schema::OWNER_TYPE) do
pending if Fog.mocking?
@owner = @service.get_media_owner(@media_id).body
end
tests("owner[:User][:name]").returns(@service.user_name) { @owner[:User][:name] }
tests("#put_media_metadata_item_metadata(#{@media_id})").data_matches_schema(VcloudDirector::Compute::Schema::TASK_TYPE) do
pending if Fog.mocking?
@task = @service.put_media_metadata_item_metadata(@media_id, 'fog-test-key', 'fog-test-value').body
end
@service.process_task(@task)
tests("#put_media_metadata_item_metadata(#{@media_id})") do
pending if Fog.mocking?
tests("#put_media_metadata_item_metadata(Boolean)").returns(true) do
task = @service.put_media_metadata_item_metadata(@media_id, 'fog-test-boolean', true).body
@service.process_task(task)
@ -66,7 +63,6 @@ Shindo.tests('Compute::VcloudDirector | media requests', ['vclouddirector']) do
end
tests("#post_update_media_metadata(#{@media_id})").data_matches_schema(VcloudDirector::Compute::Schema::TASK_TYPE) do
pending if Fog.mocking?
metadata = {
'fog-test-key-update' => 'fog-test-value-update',
'fog-test-boolean-update' => false,
@ -78,7 +74,6 @@ Shindo.tests('Compute::VcloudDirector | media requests', ['vclouddirector']) do
@service.process_task(@task)
tests("#get_media_metadata(#{@media_id})") do
pending if Fog.mocking?
tests('response format').data_matches_schema(VcloudDirector::Compute::Schema::METADATA_TYPE) do
@metadata = @service.get_media_metadata(@media_id).body
end
@ -120,7 +115,6 @@ Shindo.tests('Compute::VcloudDirector | media requests', ['vclouddirector']) do
end
tests("#post_clone_media(#{@media_id})").data_matches_schema(VcloudDirector::Compute::Schema::MEDIA_TYPE) do
pending if Fog.mocking?
@media = @service.post_clone_media(@vdc_id, @media_id, :IsSourceDelete => true).body
end
@service.process_task(@media[:Tasks][:Task])
@ -130,7 +124,6 @@ Shindo.tests('Compute::VcloudDirector | media requests', ['vclouddirector']) do
end
tests("#delete_media(#{@media_id})").data_matches_schema(VcloudDirector::Compute::Schema::TASK_TYPE) do
pending if Fog.mocking?
@task = @service.delete_media(@media_id).body
end
@service.process_task(@task)

1
tests/vcloud_director/requests/compute/vm_tests.rb
View file

@ -14,7 +14,6 @@ Shindo.tests('Compute::VcloudDirector | vm requests', ['vclouddirector']) do
end.each do |vapp|
vapp_id = vapp[:href].split('/').last
vapp = @service.get_vapp(vapp_id).body
vapp[:Children][:Vm] = [vapp[:Children][:Vm]] if vapp[:Children][:Vm].is_a?(Hash)
tests('Each VM') do
vapp[:Children][:Vm].each do |vm|