From 52a45b8ea1673f25d55d3929d66a5b7fb0c50656 Mon Sep 17 00:00:00 2001 From: geemus Date: Tue, 13 Dec 2011 18:13:04 -0600 Subject: [PATCH 1/2] [storm_on_demand] fixes for formats in tests --- tests/storm_on_demand/requests/compute/server_tests.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/storm_on_demand/requests/compute/server_tests.rb b/tests/storm_on_demand/requests/compute/server_tests.rb index ac2b26724..826ed624f 100644 --- a/tests/storm_on_demand/requests/compute/server_tests.rb +++ b/tests/storm_on_demand/requests/compute/server_tests.rb @@ -14,16 +14,16 @@ Shindo.tests('Fog::Compute[:stormondemand] | server requests', ['stormondemand'] '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 From 2e05d7a3a6bd92ac9cf73cdc48b49e378966138a Mon Sep 17 00:00:00 2001 From: geemus Date: Tue, 13 Dec 2011 18:15:42 -0600 Subject: [PATCH 2/2] [slicehost|compute] update image id in tests --- tests/slicehost/requests/compute/slice_tests.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/slicehost/requests/compute/slice_tests.rb b/tests/slicehost/requests/compute/slice_tests.rb index 976a8d3e7..da35bd6d8 100644 --- a/tests/slicehost/requests/compute/slice_tests.rb +++ b/tests/slicehost/requests/compute/slice_tests.rb @@ -16,9 +16,9 @@ Shindo.tests('Fog::Compute[:slicehost] | slice requests', ['slicehost']) do @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