Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit a0b96aa7fe6f0958b96bc52b7eacc94dc82ca31c 2 parents 67655f9 + 2e05d7a
@brianhartsock authored
View
4 tests/slicehost/requests/compute/slice_tests.rb
@@ -16,9 +16,9 @@
@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?
- data = Fog::Compute[:slicehost].create_slice(1, 19, 'fogcreateslice').body
+ data = Fog::Compute[:slicehost].create_slice(1, 305, 'fogcreateslice').body
@slice_id = data['id']
data
end
View
6 tests/storm_on_demand/requests/compute/server_tests.rb
@@ -14,16 +14,16 @@
'ip' => String,
'ip_count' => String,
'subaccnt' => String,
- 'template' => NilClass,
+ 'template' => String,
'template_description' => String,
- 'manage_level' => NilClass,
+ 'manage_level' => String,
'zone' => Hash,
'active' => Integer,
'create_date' => String
}
@servers_format = {
- 'servers' => [@server_format]
+ 'items' => [@server_format]
}
tests('success') do
Please sign in to comment.
Something went wrong with that request. Please try again.