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

[aws|rds] remove some superfluous reloads, hopefully help with travis test timing issues

This commit is contained in:
geemus 2013-01-28 14:10:39 -06:00
parent d86b0f52c0
commit 9977a01fdb
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/fog/aws/requests/rds/describe_db_instances.rb
View File

@ -48,14 +48,14 @@ module Fog
server_set.each do |server|
case server["DBInstanceStatus"]
when "creating"
if Time.now - server['InstanceCreateTime'] >= Fog::Mock.delay * 2
region = "us-east-1"
server["DBInstanceStatus"] = "available"
server["AvailabilityZone"] ||= region + 'a'
server["Endpoint"] = {"Port"=>3306,
"Address"=> Fog::AWS::Mock.rds_address(server["DBInstanceIdentifier"],region) }
server["PendingModifiedValues"] = {}
end
if Time.now - server['InstanceCreateTime'] >= Fog::Mock.delay * 2
region = "us-east-1"
server["DBInstanceStatus"] = "available"
server["AvailabilityZone"] ||= region + 'a'
server["Endpoint"] = {"Port"=>3306,
"Address"=> Fog::AWS::Mock.rds_address(server["DBInstanceIdentifier"],region) }
server["PendingModifiedValues"] = {}
end
when "rebooting"
if Time.now - self.data[:reboot_time] >= Fog::Mock.delay
# apply pending modified values
@ -76,7 +76,6 @@ module Fog
unless server["PendingModifiedValues"].empty?
server["DBInstanceStatus"] = 'modifying'
end
end
end

17
tests/aws/models/rds/server_tests.rb
View File

@ -17,9 +17,8 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
snapshot = @instance.snapshots.create(:id => 'fog-test-snapshot')
end
snapshot.wait_for {ready?}
snapshot.wait_for { ready?}
@instance.reload
@instance.wait_for { ready? }
returns(true) { @instance.snapshots.map{|s| s.id}.include?(snapshot.id) }
@ -41,7 +40,7 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
}
@instance.modify(true, modify_options)
@instance.reload
@instance.wait_for { ready? }
returns(parameter_group.id, 'new parameter group') do
@instance.db_parameter_groups.first['DBParameterGroupName']
@ -52,8 +51,8 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
end
@instance.reboot
@instance.reload.wait_for { state == 'rebooting' }
@instance.reload.wait_for { ready? }
@instance.wait_for { state == 'rebooting' }
@instance.wait_for { ready? }
# Restore back to original state using symbols
restore_options = {
@ -63,8 +62,8 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
@instance.modify(true, restore_options)
@instance.reboot
@instance.reload.wait_for { state == 'rebooting' }
@instance.reload.wait_for do
@instance.wait_for { state == 'rebooting' }
@instance.wait_for do
ready? &&
db_security_groups.all? {|hash| hash['Status'] == 'active'} &&
db_parameter_groups.all? {|hash| hash['ParameterApplyStatus'] == 'in-sync' }
@ -77,8 +76,8 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
tests("#reboot").succeeds do
@instance.reboot
end
@instance.reload.wait_for {state == 'rebooting'}
@instance.reload.wait_for { ready? }
@instance.wait_for { state == 'rebooting' }
@instance.wait_for { ready? }
tests('#create_read_replica').succeeds do

10
tests/aws/requests/rds/instance_tests.rb
View File

@ -42,8 +42,8 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
body
end
server.reload.wait_for { state == 'modifying' }
server.reload.wait_for { state == 'available' }
server.wait_for { state == 'modifying' }
server.wait_for { state == 'available' }
tests 'new storage' do
returns(new_storage){ server.allocated_storage}
@ -55,8 +55,8 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
end
end
server.reload.wait_for { state == 'rebooting' }
server.reload.wait_for { state == 'available'}
server.wait_for { state == 'rebooting' }
server.wait_for { state == 'available'}
tests("#create_db_snapshot").formats(AWS::RDS::Formats::CREATE_DB_SNAPSHOT) do
body = Fog::AWS[:rds].create_db_snapshot(@db_instance_id, @db_snapshot_id).body
@ -68,7 +68,7 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
body = Fog::AWS[:rds].describe_db_snapshots.body
end
server.reload.wait_for { state == 'available' }
server.wait_for { state == 'available' }
tests( "#create read replica").formats(AWS::RDS::Formats::CREATE_READ_REPLICA) do
Fog::AWS[:rds].create_db_instance_read_replica(@db_replica_id, @db_instance_id).body