diff --git a/tests/aws/models/compute/flavors_tests.rb b/tests/aws/models/compute/flavors_tests.rb deleted file mode 100644 index 20d58d009..000000000 --- a/tests/aws/models/compute/flavors_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('AWS::Compute | flavors collection', ['aws']) do - - flavors_tests(AWS[:compute]) - -end diff --git a/tests/aws/models/compute/server_tests.rb b/tests/aws/models/compute/server_tests.rb deleted file mode 100644 index 81e39ae42..000000000 --- a/tests/aws/models/compute/server_tests.rb +++ /dev/null @@ -1,6 +0,0 @@ -Shindo.tests('AWS::Compute | server model', ['aws']) do - - # image ami-1a837773 = Ubuntu - server_tests(AWS[:compute], {:image_id => 'ami-1a837773'}) - -end diff --git a/tests/aws/models/compute/servers_tests.rb b/tests/aws/models/compute/servers_tests.rb deleted file mode 100644 index 273fb1aa2..000000000 --- a/tests/aws/models/compute/servers_tests.rb +++ /dev/null @@ -1,6 +0,0 @@ -Shindo.tests('AWS::Compute | servers collection', ['aws']) do - - # image ami-1a837773 = Ubuntu - servers_tests(AWS[:compute], {:image_id => 'ami-1a837773'}) - -end diff --git a/tests/bluebox/models/compute/flavors_tests.rb b/tests/bluebox/models/compute/flavors_tests.rb deleted file mode 100644 index f702a259f..000000000 --- a/tests/bluebox/models/compute/flavors_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Bluebox::Compute | flavors collection', ['bluebox']) do - - flavors_tests(Bluebox[:compute], {}, false) - -end diff --git a/tests/bluebox/models/compute/server_tests.rb b/tests/bluebox/models/compute/server_tests.rb deleted file mode 100644 index 412456051..000000000 --- a/tests/bluebox/models/compute/server_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Bluebox::Compute | server model', ['bluebox']) do - - server_tests(Bluebox[:compute], {:image_id => 'a00baa8f-b5d0-4815-8238-b471c4c4bf72'}, false) - -end diff --git a/tests/bluebox/models/compute/servers_tests.rb b/tests/bluebox/models/compute/servers_tests.rb deleted file mode 100644 index 2f04d932a..000000000 --- a/tests/bluebox/models/compute/servers_tests.rb +++ /dev/null @@ -1,6 +0,0 @@ -Shindo.tests('Bluebox::Compute | servers collection', ['bluebox']) do - - # Ubuntu 9.10 64bit - servers_tests(Bluebox[:compute], {:image_id => 'a00baa8f-b5d0-4815-8238-b471c4c4bf72'}, false) - -end diff --git a/tests/brightbox/models/compute/flavors_tests.rb b/tests/brightbox/models/compute/flavors_tests.rb deleted file mode 100644 index 40b3e8546..000000000 --- a/tests/brightbox/models/compute/flavors_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Brightbox::Compute | flavors collection', ['brightbox']) do - - flavors_tests(Brightbox[:compute], {}, false) - -end diff --git a/tests/brightbox/models/compute/server_tests.rb b/tests/brightbox/models/compute/server_tests.rb deleted file mode 100644 index 44627b1fe..000000000 --- a/tests/brightbox/models/compute/server_tests.rb +++ /dev/null @@ -1,6 +0,0 @@ -Shindo.tests('Brightbox::Compute | server model', ['brightbox']) do - - image_id = Brightbox::Compute::TestSupport::IMAGE_IDENTIFER - server_tests(Brightbox[:compute], {:image_id => image_id}, false) - -end diff --git a/tests/brightbox/models/compute/servers_tests.rb b/tests/brightbox/models/compute/servers_tests.rb deleted file mode 100644 index d629e7291..000000000 --- a/tests/brightbox/models/compute/servers_tests.rb +++ /dev/null @@ -1,6 +0,0 @@ -Shindo.tests('Brightbox::Compute | servers collection', ['brightbox']) do - - image_id = Brightbox::Compute::TestSupport::IMAGE_IDENTIFER - servers_tests(Brightbox[:compute], {:image_id => image_id}, false) - -end diff --git a/tests/compute/helper.rb b/tests/compute/helper.rb new file mode 100644 index 000000000..bd3b14cd8 --- /dev/null +++ b/tests/compute/helper.rb @@ -0,0 +1,36 @@ +def compute_providers + { + AWS => { + :server_attributes => { + :image_id => 'ami-1a837773' # image ami-1a837773 = Ubuntu + }, + :mocked => true + }, + Bluebox => { + :server_attributes => { + :image_id => 'a00baa8f-b5d0-4815-8238-b471c4c4bf72' # Ubuntu 9.10 64bit + }, + :mocked => false + }, + Brightbox => { + :server_attributes => { + :image_id => 'img-9vxqi' # image img-9vxqi = Ubuntu Maverick 10.10 server + }, + :mocked => false + }, + Rackspace => { + :server_attributes => { + :image_id => 49, # image 49 = Ubuntu 10.04 LTS (lucid) + :name => "fog_#{Time.now.to_i}" + }, + :mocked => true + }, + Slicehost => { + :server_attributes => { + :image_id => 49, # image 49 = Ubuntu 10.04 LTS (lucid) + :name => "fog_#{Time.now.to_i}" + }, + :mocked => false + } + } +end diff --git a/tests/compute/models/flavors_tests.rb b/tests/compute/models/flavors_tests.rb new file mode 100644 index 000000000..4c7f1f48c --- /dev/null +++ b/tests/compute/models/flavors_tests.rb @@ -0,0 +1,9 @@ +for provider, config in compute_providers + + Shindo.tests("#{provider}::Compute | flavors", [provider.to_s.downcase]) do + + flavors_tests(provider[:compute], (config[:flavors_attributes] || {}), config[:mocked]) + + end + +end diff --git a/tests/compute/models/server_tests.rb b/tests/compute/models/server_tests.rb new file mode 100644 index 000000000..d16553d8a --- /dev/null +++ b/tests/compute/models/server_tests.rb @@ -0,0 +1,9 @@ +for provider, config in compute_providers + + Shindo.tests("#{provider}::Compute | server", [provider.to_s.downcase]) do + + server_tests(provider[:compute], (config[:server_attributes] || {}), config[:mocked]) + + end + +end diff --git a/tests/compute/models/servers_tests.rb b/tests/compute/models/servers_tests.rb new file mode 100644 index 000000000..31042c91f --- /dev/null +++ b/tests/compute/models/servers_tests.rb @@ -0,0 +1,9 @@ +for provider, config in compute_providers + + Shindo.tests("#{provider}::Compute | servers", [provider.to_s.downcase]) do + + servers_tests(provider[:compute], (config[:server_attributes] || {}), config[:mocked]) + + end + +end diff --git a/tests/aws/requests/compute/address_tests.rb b/tests/compute/requests/aws/address_tests.rb similarity index 100% rename from tests/aws/requests/compute/address_tests.rb rename to tests/compute/requests/aws/address_tests.rb diff --git a/tests/aws/requests/compute/availability_zone_tests.rb b/tests/compute/requests/aws/availability_zone_tests.rb similarity index 100% rename from tests/aws/requests/compute/availability_zone_tests.rb rename to tests/compute/requests/aws/availability_zone_tests.rb diff --git a/tests/aws/helper.rb b/tests/compute/requests/aws/helper.rb similarity index 100% rename from tests/aws/helper.rb rename to tests/compute/requests/aws/helper.rb diff --git a/tests/aws/requests/compute/image_tests.rb b/tests/compute/requests/aws/image_tests.rb similarity index 100% rename from tests/aws/requests/compute/image_tests.rb rename to tests/compute/requests/aws/image_tests.rb diff --git a/tests/aws/requests/compute/instance_tests.rb b/tests/compute/requests/aws/instance_tests.rb similarity index 100% rename from tests/aws/requests/compute/instance_tests.rb rename to tests/compute/requests/aws/instance_tests.rb diff --git a/tests/aws/requests/compute/key_pair_tests.rb b/tests/compute/requests/aws/key_pair_tests.rb similarity index 100% rename from tests/aws/requests/compute/key_pair_tests.rb rename to tests/compute/requests/aws/key_pair_tests.rb diff --git a/tests/aws/requests/compute/region_tests.rb b/tests/compute/requests/aws/region_tests.rb similarity index 100% rename from tests/aws/requests/compute/region_tests.rb rename to tests/compute/requests/aws/region_tests.rb diff --git a/tests/aws/requests/compute/security_group_tests.rb b/tests/compute/requests/aws/security_group_tests.rb similarity index 100% rename from tests/aws/requests/compute/security_group_tests.rb rename to tests/compute/requests/aws/security_group_tests.rb diff --git a/tests/aws/requests/compute/snapshot_tests.rb b/tests/compute/requests/aws/snapshot_tests.rb similarity index 100% rename from tests/aws/requests/compute/snapshot_tests.rb rename to tests/compute/requests/aws/snapshot_tests.rb diff --git a/tests/aws/requests/compute/tag_tests.rb b/tests/compute/requests/aws/tag_tests.rb similarity index 100% rename from tests/aws/requests/compute/tag_tests.rb rename to tests/compute/requests/aws/tag_tests.rb diff --git a/tests/aws/requests/compute/volume_tests.rb b/tests/compute/requests/aws/volume_tests.rb similarity index 100% rename from tests/aws/requests/compute/volume_tests.rb rename to tests/compute/requests/aws/volume_tests.rb diff --git a/tests/bluebox/requests/compute/block_tests.rb b/tests/compute/requests/bluebox/block_tests.rb similarity index 100% rename from tests/bluebox/requests/compute/block_tests.rb rename to tests/compute/requests/bluebox/block_tests.rb diff --git a/tests/bluebox/helper.rb b/tests/compute/requests/bluebox/helper.rb similarity index 100% rename from tests/bluebox/helper.rb rename to tests/compute/requests/bluebox/helper.rb diff --git a/tests/bluebox/requests/compute/product_tests.rb b/tests/compute/requests/bluebox/product_tests.rb similarity index 100% rename from tests/bluebox/requests/compute/product_tests.rb rename to tests/compute/requests/bluebox/product_tests.rb diff --git a/tests/bluebox/requests/compute/template_tests.rb b/tests/compute/requests/bluebox/template_tests.rb similarity index 100% rename from tests/bluebox/requests/compute/template_tests.rb rename to tests/compute/requests/bluebox/template_tests.rb diff --git a/tests/brightbox/requests/compute/account_tests.rb b/tests/compute/requests/brightbox/account_tests.rb similarity index 100% rename from tests/brightbox/requests/compute/account_tests.rb rename to tests/compute/requests/brightbox/account_tests.rb diff --git a/tests/brightbox/requests/compute/api_client_tests.rb b/tests/compute/requests/brightbox/api_client_tests.rb similarity index 100% rename from tests/brightbox/requests/compute/api_client_tests.rb rename to tests/compute/requests/brightbox/api_client_tests.rb diff --git a/tests/brightbox/requests/compute/cloud_ip_tests.rb b/tests/compute/requests/brightbox/cloud_ip_tests.rb similarity index 100% rename from tests/brightbox/requests/compute/cloud_ip_tests.rb rename to tests/compute/requests/brightbox/cloud_ip_tests.rb diff --git a/tests/brightbox/helper.rb b/tests/compute/requests/brightbox/helper.rb similarity index 100% rename from tests/brightbox/helper.rb rename to tests/compute/requests/brightbox/helper.rb diff --git a/tests/brightbox/requests/compute/image_tests.rb b/tests/compute/requests/brightbox/image_tests.rb similarity index 100% rename from tests/brightbox/requests/compute/image_tests.rb rename to tests/compute/requests/brightbox/image_tests.rb diff --git a/tests/brightbox/requests/compute/interface_tests.rb b/tests/compute/requests/brightbox/interface_tests.rb similarity index 100% rename from tests/brightbox/requests/compute/interface_tests.rb rename to tests/compute/requests/brightbox/interface_tests.rb diff --git a/tests/brightbox/requests/compute/load_balancer_tests.rb b/tests/compute/requests/brightbox/load_balancer_tests.rb similarity index 100% rename from tests/brightbox/requests/compute/load_balancer_tests.rb rename to tests/compute/requests/brightbox/load_balancer_tests.rb diff --git a/tests/brightbox/requests/compute/server_tests.rb b/tests/compute/requests/brightbox/server_tests.rb similarity index 100% rename from tests/brightbox/requests/compute/server_tests.rb rename to tests/compute/requests/brightbox/server_tests.rb diff --git a/tests/brightbox/requests/compute/server_type_tests.rb b/tests/compute/requests/brightbox/server_type_tests.rb similarity index 100% rename from tests/brightbox/requests/compute/server_type_tests.rb rename to tests/compute/requests/brightbox/server_type_tests.rb diff --git a/tests/brightbox/requests/compute/user_tests.rb b/tests/compute/requests/brightbox/user_tests.rb similarity index 100% rename from tests/brightbox/requests/compute/user_tests.rb rename to tests/compute/requests/brightbox/user_tests.rb diff --git a/tests/brightbox/requests/compute/zone_tests.rb b/tests/compute/requests/brightbox/zone_tests.rb similarity index 100% rename from tests/brightbox/requests/compute/zone_tests.rb rename to tests/compute/requests/brightbox/zone_tests.rb diff --git a/tests/go_grid/requests/compute/image_tests.rb b/tests/compute/requests/go_grid/image_tests.rb similarity index 100% rename from tests/go_grid/requests/compute/image_tests.rb rename to tests/compute/requests/go_grid/image_tests.rb diff --git a/tests/linode/requests/compute/datacenter_tests.rb b/tests/compute/requests/linode/datacenter_tests.rb similarity index 100% rename from tests/linode/requests/compute/datacenter_tests.rb rename to tests/compute/requests/linode/datacenter_tests.rb diff --git a/tests/linode/requests/compute/distribution_tests.rb b/tests/compute/requests/linode/distribution_tests.rb similarity index 100% rename from tests/linode/requests/compute/distribution_tests.rb rename to tests/compute/requests/linode/distribution_tests.rb diff --git a/tests/linode/helper.rb b/tests/compute/requests/linode/helper.rb similarity index 100% rename from tests/linode/helper.rb rename to tests/compute/requests/linode/helper.rb diff --git a/tests/linode/requests/compute/linode_tests.rb b/tests/compute/requests/linode/linode_tests.rb similarity index 100% rename from tests/linode/requests/compute/linode_tests.rb rename to tests/compute/requests/linode/linode_tests.rb diff --git a/tests/linode/requests/compute/linodeplans_tests.rb b/tests/compute/requests/linode/linodeplans_tests.rb similarity index 100% rename from tests/linode/requests/compute/linodeplans_tests.rb rename to tests/compute/requests/linode/linodeplans_tests.rb diff --git a/tests/rackspace/requests/compute/address_tests.rb b/tests/compute/requests/rackspace/address_tests.rb similarity index 100% rename from tests/rackspace/requests/compute/address_tests.rb rename to tests/compute/requests/rackspace/address_tests.rb diff --git a/tests/rackspace/requests/compute/flavor_tests.rb b/tests/compute/requests/rackspace/flavor_tests.rb similarity index 100% rename from tests/rackspace/requests/compute/flavor_tests.rb rename to tests/compute/requests/rackspace/flavor_tests.rb diff --git a/tests/rackspace/helper.rb b/tests/compute/requests/rackspace/helper.rb similarity index 100% rename from tests/rackspace/helper.rb rename to tests/compute/requests/rackspace/helper.rb diff --git a/tests/rackspace/requests/compute/image_tests.rb b/tests/compute/requests/rackspace/image_tests.rb similarity index 100% rename from tests/rackspace/requests/compute/image_tests.rb rename to tests/compute/requests/rackspace/image_tests.rb diff --git a/tests/rackspace/requests/compute/resize_tests.rb b/tests/compute/requests/rackspace/resize_tests.rb similarity index 100% rename from tests/rackspace/requests/compute/resize_tests.rb rename to tests/compute/requests/rackspace/resize_tests.rb diff --git a/tests/rackspace/requests/compute/server_tests.rb b/tests/compute/requests/rackspace/server_tests.rb similarity index 100% rename from tests/rackspace/requests/compute/server_tests.rb rename to tests/compute/requests/rackspace/server_tests.rb diff --git a/tests/slicehost/requests/compute/backup_tests.rb b/tests/compute/requests/slicehost/backup_tests.rb similarity index 100% rename from tests/slicehost/requests/compute/backup_tests.rb rename to tests/compute/requests/slicehost/backup_tests.rb diff --git a/tests/slicehost/requests/compute/flavor_tests.rb b/tests/compute/requests/slicehost/flavor_tests.rb similarity index 100% rename from tests/slicehost/requests/compute/flavor_tests.rb rename to tests/compute/requests/slicehost/flavor_tests.rb diff --git a/tests/slicehost/requests/compute/image_tests.rb b/tests/compute/requests/slicehost/image_tests.rb similarity index 100% rename from tests/slicehost/requests/compute/image_tests.rb rename to tests/compute/requests/slicehost/image_tests.rb diff --git a/tests/slicehost/requests/compute/slice_tests.rb b/tests/compute/requests/slicehost/slice_tests.rb similarity index 100% rename from tests/slicehost/requests/compute/slice_tests.rb rename to tests/compute/requests/slicehost/slice_tests.rb diff --git a/tests/go_grid/helper.rb b/tests/go_grid/helper.rb deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/rackspace/models/compute/flavors_tests.rb b/tests/rackspace/models/compute/flavors_tests.rb deleted file mode 100644 index 12bc68b23..000000000 --- a/tests/rackspace/models/compute/flavors_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Rackspace::Compute | flavors collection', ['rackspace']) do - - flavors_tests(Rackspace[:compute], {}, false) - -end diff --git a/tests/rackspace/models/compute/server_tests.rb b/tests/rackspace/models/compute/server_tests.rb deleted file mode 100644 index 14f1acca5..000000000 --- a/tests/rackspace/models/compute/server_tests.rb +++ /dev/null @@ -1,6 +0,0 @@ -Shindo.tests('Rackspace::Compute | server model', ['rackspace']) do - - # image 49 = Ubuntu 10.04 LTS (lucid) - server_tests(Rackspace[:compute], {:image_id => 49, :name => "fog_#{Time.now.to_i}"}) - -end diff --git a/tests/rackspace/models/compute/servers_tests.rb b/tests/rackspace/models/compute/servers_tests.rb deleted file mode 100644 index 1c6d59271..000000000 --- a/tests/rackspace/models/compute/servers_tests.rb +++ /dev/null @@ -1,6 +0,0 @@ -Shindo.tests('Rackspace::Compute | servers collection', ['rackspace']) do - - # image 49 = Ubuntu 10.04 LTS (lucid) - servers_tests(Rackspace[:compute], {:image_id => 49, :name => "fog_#{Time.now.to_i}"}) - -end diff --git a/tests/slicehost/helper.rb b/tests/slicehost/helper.rb deleted file mode 100644 index 8b1378917..000000000 --- a/tests/slicehost/helper.rb +++ /dev/null @@ -1 +0,0 @@ - diff --git a/tests/slicehost/models/compute/flavors_tests.rb b/tests/slicehost/models/compute/flavors_tests.rb deleted file mode 100644 index 8ced27d7f..000000000 --- a/tests/slicehost/models/compute/flavors_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Slicehost::Compute | flavors collection', ['slicehost']) do - - flavors_tests(Slicehost[:compute], {}, false) - -end diff --git a/tests/slicehost/models/compute/server_tests.rb b/tests/slicehost/models/compute/server_tests.rb deleted file mode 100644 index 881fa18bc..000000000 --- a/tests/slicehost/models/compute/server_tests.rb +++ /dev/null @@ -1,6 +0,0 @@ -Shindo.tests('Slicehost::Compute | server model', ['slicehost']) do - - # image 49 = Ubuntu 10.04 LTS (lucid) - server_tests(Slicehost[:compute], {:image_id => 49, :name => "fog_#{Time.now.to_i}"}, false) - -end diff --git a/tests/slicehost/models/compute/servers_tests.rb b/tests/slicehost/models/compute/servers_tests.rb deleted file mode 100644 index 852066459..000000000 --- a/tests/slicehost/models/compute/servers_tests.rb +++ /dev/null @@ -1,6 +0,0 @@ -Shindo.tests('Slicehost::Compute | servers collection', ['slicehost']) do - - # image 49 = Ubuntu 10.04 LTS (lucid) - servers_tests(Slicehost[:compute], {:image_id => 49, :name => "fog_#{Time.now.to_i}"}, false) - -end