1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00

Merge branch 'master' of github.com:fog/fog

This commit is contained in:
Brian Hartsock 2011-12-13 19:19:36 -05:00
commit a0b96aa7fe
2 changed files with 5 additions and 5 deletions

View file

@ -16,9 +16,9 @@ Shindo.tests('Fog::Compute[:slicehost] | slice requests', ['slicehost']) do
@slice_id = nil @slice_id = nil
tests("#create_slice(1, 19, 'fogcreateslice')").formats(@slice_format.merge('root-password' => String)) do tests("#create_slice(1, 305, 'fogcreateslice')").formats(@slice_format.merge('root-password' => String)) do
pending if Fog.mocking? pending if Fog.mocking?
data = Fog::Compute[:slicehost].create_slice(1, 19, 'fogcreateslice').body data = Fog::Compute[:slicehost].create_slice(1, 305, 'fogcreateslice').body
@slice_id = data['id'] @slice_id = data['id']
data data
end end

View file

@ -14,16 +14,16 @@ Shindo.tests('Fog::Compute[:stormondemand] | server requests', ['stormondemand']
'ip' => String, 'ip' => String,
'ip_count' => String, 'ip_count' => String,
'subaccnt' => String, 'subaccnt' => String,
'template' => NilClass, 'template' => String,
'template_description' => String, 'template_description' => String,
'manage_level' => NilClass, 'manage_level' => String,
'zone' => Hash, 'zone' => Hash,
'active' => Integer, 'active' => Integer,
'create_date' => String 'create_date' => String
} }
@servers_format = { @servers_format = {
'servers' => [@server_format] 'items' => [@server_format]
} }
tests('success') do tests('success') do