kotovalexarian-likes-github
/
fog--fog
mirror of https://github.com/fog/fog.git
1
0
Fork 0
Code Releases Activity

[rackspace|loadbalancers] fixed broken tests

This commit is contained in:
Brian Hartsock 2012-05-15 17:38:45 -04:00
parent 48789a33b6
commit f1d435bf93
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/rackspace/helper.rb
View File

@ -10,7 +10,7 @@ module Shindo
:protocol => 'HTTP',
:port => 80,
:virtual_ips => [{ :type => 'PUBLIC'}],
:nodes => [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}]
:nodes => [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}]
})
@lb.wait_for { ready? }
begin

2
tests/rackspace/models/load_balancers/access_list_tests.rb
View File

@ -4,7 +4,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | access_list', ['rackspace']) do
given_a_load_balancer_service do
given_a_load_balancer do
model_tests(@lb.access_rules, { :address => '10.0.0.2', :type => 'ALLOW'}, false) do
model_tests(@lb.access_rules, { :address => '1.1.1.2', :type => 'ALLOW'}, false) do
@lb.wait_for { ready? }
end
end

2
tests/rackspace/models/load_balancers/access_lists_tests.rb
View File

@ -4,7 +4,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | access_lists', ['rackspace']) do
given_a_load_balancer_service do
given_a_load_balancer do
collection_tests(@lb.access_rules, { :address => '10.0.0.2', :type => 'ALLOW'}, false) do
collection_tests(@lb.access_rules, { :address => '1.1.1.2', :type => 'ALLOW'}, false) do
@lb.wait_for { ready? }
end
end

2
tests/rackspace/models/load_balancers/load_balancer_tests.rb
View File

@ -7,7 +7,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer', ['rackspace']) do
:protocol => 'HTTP',
:port => 80,
:virtual_ips => [{ :type => 'PUBLIC'}],
:nodes => [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}]
:nodes => [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}]
}
given_a_load_balancer_service do

2
tests/rackspace/models/load_balancers/load_balancers_tests.rb
View File

@ -10,7 +10,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancers', ['rackspace']) do
:protocol => 'HTTP',
:port => 80,
:virtual_ips => [{ :type => 'PUBLIC'}],
:nodes => [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}]
:nodes => [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}]
},
false) do
@instance.wait_for { ready? }

2
tests/rackspace/models/load_balancers/node_tests.rb
View File

@ -4,7 +4,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | node', ['rackspace']) do
given_a_load_balancer_service do
given_a_load_balancer do
model_tests(@lb.nodes, { :address => '10.0.0.2', :port => 80, :condition => 'ENABLED'}, false) do
model_tests(@lb.nodes, { :address => '1.1.1.2', :port => 80, :condition => 'ENABLED'}, false) do
@lb.wait_for { ready? }
tests("#save() => existing node with port = 88").succeeds do

2
tests/rackspace/models/load_balancers/nodes_tests.rb
View File

@ -4,7 +4,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | nodes', ['rackspace']) do
given_a_load_balancer_service do
given_a_load_balancer do
collection_tests(@lb.nodes, { :address => '10.0.0.2', :port => 80, :condition => 'ENABLED'}, false) do
collection_tests(@lb.nodes, { :address => '1.1.1.2', :port => 80, :condition => 'ENABLED'}, false) do
@lb.wait_for { ready? }
end
end

10
tests/rackspace/requests/load_balancers/load_balancer_tests.rb
View File

@ -9,14 +9,14 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace'
@lb_name = 'fog' + Time.now.to_i.to_s
tests("#create_load_balancer(#{@lb_name}, 'HTTP', 80,...)").formats(LOAD_BALANCER_FORMAT) do
data = @service.create_load_balancer(@lb_name, 'HTTP', 80, [{ :type => 'PUBLIC'}], [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}]).body
data = @service.create_load_balancer(@lb_name, 'HTTP', 80, [{ :type => 'PUBLIC'}], [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}]).body
@lb_id = data['loadBalancer']['id']
data
end
tests("#create_load_balancer(#{@lb_name}, 'HTTP', 80,...with algorithm)").formats(LOAD_BALANCER_FORMAT) do
data = @service.create_load_balancer(@lb_name, 'HTTP', 80, [{ :type => 'PUBLIC'}],
[{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}],
[{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}],
{ :algorithm => 'LEAST_CONNECTIONS' }).body
@lb_id = data['loadBalancer']['id']
returns('LEAST_CONNECTIONS') { data['loadBalancer']['algorithm'] }
@ -39,8 +39,8 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace'
sleep 10
end
tests("#list_load_balancers({:node_address => '10.0.0.1'})").formats(LOAD_BALANCERS_FORMAT) do
@service.list_load_balancers({:node_address => '10.0.0.1'}).body
tests("#list_load_balancers({:node_address => '1.1.1.1'})").formats(LOAD_BALANCERS_FORMAT) do
@service.list_load_balancers({:node_address => '1.1.1.1'}).body
end
tests("#update_load_balancer(#{@lb_id}, { :port => 80 })").succeeds do
@ -58,7 +58,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace'
tests('failure') do
tests('#create_load_balancer(invalid name)').raises(Fog::Rackspace::LoadBalancers::BadRequest) do
@service.create_load_balancer('', 'HTTP', 80, [{ :type => 'PUBLIC'}], [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}])
@service.create_load_balancer('', 'HTTP', 80, [{ :type => 'PUBLIC'}], [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}])
end
tests('#get_load_balancer(0)').raises(Fog::Rackspace::LoadBalancers::NotFound) do

10
tests/rackspace/requests/load_balancers/node_tests.rb
View File

@ -9,15 +9,15 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | node_tests', ['rackspace']) do
tests('success') do
@lb.wait_for { ready? }
tests("#create_node(#{@lb.id}, '10.10.10.10', 80, 'ENABLED')").formats(NODES_FORMAT) do
data = @service.create_node(@lb.id, '10.10.10.10', 80, 'ENABLED').body
tests("#create_node(#{@lb.id}, '1.1.1.2', 80, 'ENABLED')").formats(NODES_FORMAT) do
data = @service.create_node(@lb.id, '1.1.1.2', 80, 'ENABLED').body
@nodes_created << data['nodes'][0]['id']
data
end
@lb.wait_for { ready? }
tests('#create_node with weight').formats(NODES_FORMAT) do
data = @service.create_node(@lb.id, '10.10.10.11', 80, 'ENABLED', { :weight => 10 }).body
data = @service.create_node(@lb.id, '1.1.1.3', 80, 'ENABLED', { :weight => 10 }).body
@nodes_created << data['nodes'][0]['id']
data
end
@ -53,7 +53,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | node_tests', ['rackspace']) do
@service.create_node(@lb.id, '', 80, 'ENABLED')
end
tests('#create_node(invalid condition)').raises(Fog::Rackspace::LoadBalancers::BadRequest) do
@service.create_node(@lb.id, '10.10.10.10', 80, 'EABLED')
@service.create_node(@lb.id, '1.1.1.2', 80, 'EABLED')
end
tests("#get_node(#{@lb.id}, 0)").raises(Fog::Rackspace::LoadBalancers::NotFound) do
@service.get_node(@lb.id, 0)
@ -76,7 +76,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | node_tests', ['rackspace']) do
end
@lb.wait_for { ready? }
tests("#delete_node()").succeeds do
node_id = @service.create_node(@lb.id, '10.10.10.12', 80, 'ENABLED').body['nodes'][0]['id']
node_id = @service.create_node(@lb.id, '1.1.1.3', 80, 'ENABLED').body['nodes'][0]['id']
@lb.wait_for { ready? }
@service.delete_node(@lb.id, node_id)
end