mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
Test tweaks
This commit is contained in:
parent
fc18e38dea
commit
9fb34868d2
2 changed files with 66 additions and 66 deletions
|
@ -14,66 +14,66 @@ Shindo.tests('Bluebox::Compute | block requests', ['bluebox']) do
|
|||
}
|
||||
|
||||
tests('success') do
|
||||
#
|
||||
# @product_id = '94fd37a7-2606-47f7-84d5-9000deda52ae' # 1 GB
|
||||
# @template_id = 'a00baa8f-b5d0-4815-8238-b471c4c4bf72' # Ubuntu 9.10 64bit
|
||||
# @password = 'chunkybacon'
|
||||
#
|
||||
# @block_id = nil
|
||||
#
|
||||
# tests("create_block('#{@product_id}', '#{@template_id}', 'password' => '#{@password}')").formats(@block_format) do
|
||||
# pending if Fog.mocking?
|
||||
# data = Bluebox[:compute].create_block(@product_id, @template_id, 'password' => @password).body
|
||||
# @block_id = data['id']
|
||||
# data
|
||||
# end
|
||||
#
|
||||
# unless Fog.mocking?
|
||||
# Bluebox[:compute].servers.get(@block_id).wait_for { ready? }
|
||||
# end
|
||||
#
|
||||
# tests("get_block('#{@block_id}')").formats(@block_format) do
|
||||
# pending if Fog.mocking?
|
||||
# Bluebox[:compute].get_block(@block_id).body
|
||||
# end
|
||||
#
|
||||
# tests("get_blocks").formats([@block_format.reject {|key,value| ['product', 'template'].include?(key)}]) do
|
||||
# pending if Fog.mocking?
|
||||
# Bluebox[:compute].get_blocks.body
|
||||
# end
|
||||
#
|
||||
# tests("reboot_block('#{@block_id}')").formats({'status' => String, 'text' => String}) do
|
||||
# pending if Fog.mocking?
|
||||
# Bluebox[:compute].reboot_block(@block_id).body
|
||||
# end
|
||||
#
|
||||
# unless Fog.mocking?
|
||||
# Bluebox[:compute].servers.get(@block_id).wait_for { ready? }
|
||||
# end
|
||||
#
|
||||
# tests("destroy_block('#{@block_id})'").formats({'text' => String}) do
|
||||
# pending if Fog.mocking?
|
||||
# Bluebox[:compute].destroy_block(@block_id).body
|
||||
# end
|
||||
#
|
||||
# end
|
||||
#
|
||||
# tests('failure') do
|
||||
#
|
||||
# tests("get_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
|
||||
# pending if Fog.mocking?
|
||||
# Bluebox[:compute].get_block('00000000-0000-0000-0000-000000000000')
|
||||
# end
|
||||
#
|
||||
# tests("reboot_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
|
||||
# pending if Fog.mocking?
|
||||
# Bluebox[:compute].reboot_block('00000000-0000-0000-0000-000000000000')
|
||||
# end
|
||||
#
|
||||
# tests("destroy_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
|
||||
# pending if Fog.mocking?
|
||||
# Bluebox[:compute].destroy_block('00000000-0000-0000-0000-000000000000')
|
||||
# end
|
||||
|
||||
@product_id = '94fd37a7-2606-47f7-84d5-9000deda52ae' # 1 GB
|
||||
@template_id = 'a00baa8f-b5d0-4815-8238-b471c4c4bf72' # Ubuntu 9.10 64bit
|
||||
@password = 'chunkybacon'
|
||||
|
||||
@block_id = nil
|
||||
|
||||
tests("create_block('#{@product_id}', '#{@template_id}', 'password' => '#{@password}')").formats(@block_format) do
|
||||
pending if Fog.mocking?
|
||||
data = Bluebox[:compute].create_block(@product_id, @template_id, 'password' => @password).body
|
||||
@block_id = data['id']
|
||||
data
|
||||
end
|
||||
|
||||
unless Fog.mocking?
|
||||
Bluebox[:compute].servers.get(@block_id).wait_for { ready? }
|
||||
end
|
||||
|
||||
tests("get_block('#{@block_id}')").formats(@block_format) do
|
||||
pending if Fog.mocking?
|
||||
Bluebox[:compute].get_block(@block_id).body
|
||||
end
|
||||
|
||||
tests("get_blocks").formats([@block_format.reject {|key,value| ['product', 'template'].include?(key)}]) do
|
||||
pending if Fog.mocking?
|
||||
Bluebox[:compute].get_blocks.body
|
||||
end
|
||||
|
||||
tests("reboot_block('#{@block_id}')").formats({'status' => String, 'text' => String}) do
|
||||
pending if Fog.mocking?
|
||||
Bluebox[:compute].reboot_block(@block_id).body
|
||||
end
|
||||
|
||||
unless Fog.mocking?
|
||||
Bluebox[:compute].servers.get(@block_id).wait_for { ready? }
|
||||
end
|
||||
|
||||
tests("destroy_block('#{@block_id})'").formats({'text' => String}) do
|
||||
pending if Fog.mocking?
|
||||
Bluebox[:compute].destroy_block(@block_id).body
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
tests('failure') do
|
||||
|
||||
tests("get_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
|
||||
pending if Fog.mocking?
|
||||
Bluebox[:compute].get_block('00000000-0000-0000-0000-000000000000')
|
||||
end
|
||||
|
||||
tests("reboot_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
|
||||
pending if Fog.mocking?
|
||||
Bluebox[:compute].reboot_block('00000000-0000-0000-0000-000000000000')
|
||||
end
|
||||
|
||||
tests("destroy_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
|
||||
pending if Fog.mocking?
|
||||
Bluebox[:compute].destroy_block('00000000-0000-0000-0000-000000000000')
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
|
|
@ -186,9 +186,9 @@ Shindo.tests('Bluebox::dns | DNS requests', ['bluebox', 'dns']) do
|
|||
|
||||
response = Bluebox[:dns].get_record(@new_zones[1], @record_id)
|
||||
if response.status == 200
|
||||
mail_domain = 'mail.' + @domain
|
||||
record = response.body['records'][0]
|
||||
if (record['type'] == 'MX') and (record['name'] == @domain) and (record['content'] == mail_domain) and (record['priority'] == 10)
|
||||
mail_domain = 'mail.' + @domain + "."
|
||||
record = response.body
|
||||
if (record['type'] == 'MX') and (record['name'] == @domain) and (record['content'] == mail_domain) and (record['priority'] == '10')
|
||||
result= true
|
||||
end
|
||||
end
|
||||
|
@ -201,7 +201,7 @@ Shindo.tests('Bluebox::dns | DNS requests', ['bluebox', 'dns']) do
|
|||
|
||||
result= false
|
||||
|
||||
response = Bluebox[:dns].get_records()
|
||||
response = Bluebox[:dns].get_records(@new_zones[1])
|
||||
if response.status == 200
|
||||
records = response.body['records']
|
||||
|
||||
|
@ -209,8 +209,8 @@ Shindo.tests('Bluebox::dns | DNS requests', ['bluebox', 'dns']) do
|
|||
records.each {|record|
|
||||
if record['type'] == 'MX'
|
||||
|
||||
mail_domain = 'mail.' + @domain
|
||||
if (record['type'] == 'MX') and (record['name'] == @domain) and (record['content'] == mail_domain) and (record['priority'] == 10)
|
||||
mail_domain = 'mail.' + @domain + "."
|
||||
if (record['type'] == 'MX') and (record['name'] == @domain) and (record['content'] == mail_domain) and (record['priority'] == '10')
|
||||
result= true
|
||||
break
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue