kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[aws|rds] Improve instance tests

Browse source 
* Tests pass if other RDS servers & snapshots are in the AWS account
* Removed uneccessary Fog.wait_for blocks
* DRYed up values as variables
* Cleaned up whitespace
This commit is contained in:
Aaron Suggs 2011-05-07 15:59:42 -04:00
parent 72855da3d7
commit 220c97249b
1 changed files with 60 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
tests/aws/requests/rds/instance_tests.rb
View file

@ -1,6 +1,13 @@
Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
@db_instance_id='fog-test'
@db_replica_id='fog-replica'
# random_differentiator
# Useful when rapidly re-running tests, so we don't have to wait
# serveral minutes for deleted servers to disappear
suffix = rand(65536).to_s(16)
@db_instance_id = "fog-test-#{suffix}"
@db_replica_id = "fog-replica-#{suffix}"
@db_snapshot_id = "fog-snapshot"
@db_final_snapshot_id = "fog-final-snapshot"
tests('success') do
pending if Fog.mocking?
@ -27,22 +34,21 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
server.wait_for {ready?}
new_storage = 6
tests("#modify_db_instance with immediate apply").formats(AWS::RDS::Formats::MODIFY_DB_INSTANCE) do
body = AWS[:rds].modify_db_instance( @db_instance_id, true, 'AllocatedStorage'=> 10).body
body = AWS[:rds].modify_db_instance(@db_instance_id, true, 'AllocatedStorage'=> new_storage).body
tests 'pending storage' do
instance = body['ModifyDBInstanceResult']['DBInstance']
returns(10){instance['PendingModifiedValues']['AllocatedStorage']}
returns(new_storage){instance['PendingModifiedValues']['AllocatedStorage']}
end
body
end
server.wait_for { state == 'modifying' }
server.wait_for { state == 'available' }
server.reload
tests 'new storage' do
returns(10){ server.allocated_storage}
returns(new_storage){ server.allocated_storage}
end
server.wait_for { state == 'available'}
tests("reboot db instance") do
tests("#reboot").formats(AWS::RDS::Formats::REBOOT_DB_INSTANCE) do
@ -51,27 +57,20 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
server.wait_for { state == 'rebooting' }
server.wait_for { state == 'available'}
server.reload
end
tests("#create_db_snapshot").formats(AWS::RDS::Formats::CREATE_DB_SNAPSHOT) do
body = AWS[:rds].create_db_snapshot(@db_instance_id, 'fog-snapshot').body
body = AWS[:rds].create_db_snapshot(@db_instance_id, @db_snapshot_id).body
returns('creating'){ body['CreateDBSnapshotResult']['DBSnapshot']['Status']}
body
end
tests("#describe_db_snapshots").formats(AWS::RDS::Formats::DESCRIBE_DB_SNAPSHOTS) do
body = AWS[:rds].describe_db_snapshots().body
end
Fog.wait_for do
data = AWS[:rds].describe_db_snapshots(:snapshot_id => 'fog-snapshot')
status = data.body['DescribeDBSnapshotsResult']['DBSnapshots'].first['Status']
status =='available'
body = AWS[:rds].describe_db_snapshots.body
end
tests( "#create read replica").formats(AWS::RDS::Formats::CREATE_READ_REPLICA) do
AWS[:rds].servers.get(@db_instance_id).wait_for { ready? }
AWS[:rds].create_db_instance_read_replica(@db_replica_id, @db_instance_id).body
end
@ -88,28 +87,27 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
end
tests("#delete_db_instance").formats(AWS::RDS::Formats::DELETE_DB_INSTANCE) do
server.wait_for { state == 'available'}
#server.wait_for { state == 'available'}
AWS[:rds].delete_db_instance(@db_replica_id, nil, true)
body = AWS[:rds].delete_db_instance(@db_instance_id, 'fog-final-snapshot').body
Fog.wait_for do
AWS[:rds].servers.length == 0
end
body = AWS[:rds].delete_db_instance(@db_instance_id, @db_final_snapshot_id).body
tests "final snapshot" do
returns('available'){AWS[:rds].describe_db_snapshots(:snapshot_id => 'fog-final-snapshot').body['DescribeDBSnapshotsResult']['DBSnapshots'].first['Status']}
returns('creating'){AWS[:rds].describe_db_snapshots(:snapshot_id => @db_final_snapshot_id).body['DescribeDBSnapshotsResult']['DBSnapshots'].first['Status']}
end
body
end
tests("#delete_db_snapshot").formats(AWS::RDS::Formats::DELETE_DB_SNAPSHOT) do
AWS[:rds].delete_db_snapshot('fog-snapshot').body
AWS[:rds].snapshots.get(@db_snapshot_id).wait_for { ready? }
AWS[:rds].delete_db_snapshot(@db_snapshot_id).body
end
AWS[:rds].delete_db_snapshot('fog-final-snapshot')
returns([]){ AWS[:rds].describe_db_snapshots.body['DescribeDBSnapshotsResult']['DBSnapshots']}
tests("snapshot.destroy") do
snapshot = AWS[:rds].snapshots.get(@db_final_snapshot_id)
snapshot.wait_for { ready? }
snapshot.destroy
returns(nil) { AWS[:rds].snapshots.get(@db_final_snapshot_id) }
end
end
@ -127,5 +125,3 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
end
end
end