From 00b608090dba1c12842fdf7659507f9f0a2a51d1 Mon Sep 17 00:00:00 2001 From: Kyle Rames Date: Wed, 16 Oct 2013 10:24:06 -0500 Subject: [PATCH] [rackspace] setting rackspace_region to nil in default tests to override any settings loaded via Fog.credentials --- tests/rackspace/block_storage_tests.rb | 2 +- tests/rackspace/cdn_tests.rb | 2 +- tests/rackspace/compute_tests.rb | 2 +- tests/rackspace/compute_v2_tests.rb | 2 +- tests/rackspace/databases_tests.rb | 2 +- tests/rackspace/dns_tests.rb | 2 +- tests/rackspace/load_balancer_tests.rb | 2 +- tests/rackspace/storage_tests.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/rackspace/block_storage_tests.rb b/tests/rackspace/block_storage_tests.rb index 5a16d649e..951e73653 100644 --- a/tests/rackspace/block_storage_tests.rb +++ b/tests/rackspace/block_storage_tests.rb @@ -79,7 +79,7 @@ Shindo.tests('Fog::Rackspace::BlockStorage', ['rackspace']) do pending if Fog.mocking? tests('no params').succeeds do - @service = Fog::Rackspace::BlockStorage.new + @service = Fog::Rackspace::BlockStorage.new :rackspace_region => nil returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil } @service.list_volumes diff --git a/tests/rackspace/cdn_tests.rb b/tests/rackspace/cdn_tests.rb index c369a49fc..277922cff 100644 --- a/tests/rackspace/cdn_tests.rb +++ b/tests/rackspace/cdn_tests.rb @@ -76,7 +76,7 @@ Shindo.tests('Fog::CDN::Rackspace', ['rackspace']) do pending if Fog.mocking? tests('no params').succeeds do - @service = Fog::CDN::Rackspace.new + @service = Fog::CDN::Rackspace.new :rackspace_region => nil returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true, "uses DFW") { (@service.instance_variable_get("@uri").host =~ /cdn1/) != nil } @service.get_containers diff --git a/tests/rackspace/compute_tests.rb b/tests/rackspace/compute_tests.rb index f64e8a6c3..ebfd21ac0 100644 --- a/tests/rackspace/compute_tests.rb +++ b/tests/rackspace/compute_tests.rb @@ -65,7 +65,7 @@ Shindo.tests('Rackspace | Compute', ['rackspace']) do pending if Fog.mocking? tests('no params').succeeds do - @service = Fog::Compute::Rackspace.new + @service = Fog::Compute::Rackspace.new :rackspace_region => nil returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true) { (@service.instance_variable_get("@uri").host == 'servers.api.rackspacecloud.com') != nil } @service.list_flavors diff --git a/tests/rackspace/compute_v2_tests.rb b/tests/rackspace/compute_v2_tests.rb index 494f53707..2def6058f 100644 --- a/tests/rackspace/compute_v2_tests.rb +++ b/tests/rackspace/compute_v2_tests.rb @@ -78,7 +78,7 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do pending if Fog.mocking? tests('no params').succeeds do - @service = Fog::Compute::RackspaceV2.new + @service = Fog::Compute::RackspaceV2.new :rackspace_region => nil returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil } @service.list_flavors diff --git a/tests/rackspace/databases_tests.rb b/tests/rackspace/databases_tests.rb index caaf044a6..ad955fb15 100644 --- a/tests/rackspace/databases_tests.rb +++ b/tests/rackspace/databases_tests.rb @@ -79,7 +79,7 @@ Shindo.tests('Fog::Rackspace::Databases', ['rackspace']) do |variable| pending if Fog.mocking? tests('no params').succeeds do - @service = Fog::Rackspace::Databases.new + @service = Fog::Rackspace::Databases.new :rackspace_region => nil returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil } @service.flavors diff --git a/tests/rackspace/dns_tests.rb b/tests/rackspace/dns_tests.rb index 1d5cb9ab7..353f42009 100644 --- a/tests/rackspace/dns_tests.rb +++ b/tests/rackspace/dns_tests.rb @@ -69,7 +69,7 @@ Shindo.tests('Fog::DNS::Rackspace', ['rackspace']) do pending if Fog.mocking? tests('no params').succeeds do - @service = Fog::DNS::Rackspace.new + @service = Fog::DNS::Rackspace.new :rackspace_region => nil returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(false, "path populated") { @service.instance_variable_get("@uri").host.nil? } returns(true, "contains tenant id") { (@service.instance_variable_get("@uri").path =~ /\/v1\.0\/\d+$/) != nil} #dns does not error if tenant id is missing diff --git a/tests/rackspace/load_balancer_tests.rb b/tests/rackspace/load_balancer_tests.rb index 0dfb67eb5..f3b0f09c2 100644 --- a/tests/rackspace/load_balancer_tests.rb +++ b/tests/rackspace/load_balancer_tests.rb @@ -78,7 +78,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers', ['rackspace']) do pending if Fog.mocking? tests('no params').succeeds do - @service = Fog::Rackspace::LoadBalancers.new + @service = Fog::Rackspace::LoadBalancers.new :rackspace_region => nil returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil } @service.list_load_balancers diff --git a/tests/rackspace/storage_tests.rb b/tests/rackspace/storage_tests.rb index 2985318c9..b0ae70230 100644 --- a/tests/rackspace/storage_tests.rb +++ b/tests/rackspace/storage_tests.rb @@ -76,7 +76,7 @@ Shindo.tests('Rackspace | Storage', ['rackspace']) do pending if Fog.mocking? tests('no params').succeeds do - @service = Fog::Storage::Rackspace.new + @service = Fog::Storage::Rackspace.new :rackspace_region => nil returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw\d/) != nil } @service.head_containers