Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak tests.

Browse Source
This commit is contained in:
Chris Henry 2015-01-27 01:53:57 -05:00
parent f78d3b79df
commit 7766588681
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -6,5 +6,5 @@ init:
test: test:
rm -f .coverage rm -f .coverage
@nosetests -sv --with-coverage ./tests/ @nosetests -sv --nocapture ./tests/

18
tests/test_rds2/test_rds2.py
View File

@ -34,7 +34,7 @@ def test_get_databases():
conn = boto.rds2.connect_to_region("us-west-2") conn = boto.rds2.connect_to_region("us-west-2")
instances = conn.describe_db_instances() instances = conn.describe_db_instances()
list(instances['DescribeDBInstanceResponse']['DescribeDBInstanceResult']).should.have.length_of(0) list(instances['DescribeDBInstancesResponse']['DescribeDBInstancesResult']['DBInstances']).should.have.length_of(0)
conn.create_db_instance(db_instance_identifier='db-master-1', conn.create_db_instance(db_instance_identifier='db-master-1',
allocated_storage=10, allocated_storage=10,
@ -51,11 +51,11 @@ def test_get_databases():
master_user_password='hunter2', master_user_password='hunter2',
db_security_groups=["my_sg"]) db_security_groups=["my_sg"])
instances = conn.describe_db_instances() instances = conn.describe_db_instances()
list(instances['DescribeDBInstanceResponse']['DescribeDBInstanceResult']).should.have.length_of(2) list(instances['DescribeDBInstancesResponse']['DescribeDBInstancesResult']['DBInstances']).should.have.length_of(2)
instances = conn.describe_db_instances("db-master-1") instances = conn.describe_db_instances("db-master-1")
list(instances['DescribeDBInstanceResponse']['DescribeDBInstanceResult']).should.have.length_of(1) list(instances['DescribeDBInstancesResponse']['DescribeDBInstancesResult']['DBInstances']).should.have.length_of(1)
instances['DescribeDBInstanceResponse']['DescribeDBInstanceResult'][0]['DBInstance']['DBInstanceIdentifier'].should.equal("db-master-1") instances['DescribeDBInstancesResponse']['DescribeDBInstancesResult']['DBInstances'][0]['DBInstanceIdentifier'].should.equal("db-master-1")
@disable_on_py3() @disable_on_py3()
@ -77,10 +77,10 @@ def test_modify_db_instance():
master_user_password='hunter2', master_user_password='hunter2',
db_security_groups=["my_sg"]) db_security_groups=["my_sg"])
instances = conn.describe_db_instances('db-master-1') instances = conn.describe_db_instances('db-master-1')
instances['DescribeDBInstanceResponse']['DescribeDBInstanceResult'][0]['DBInstance']['AllocatedStorage'].should.equal('10') instances['DescribeDBInstancesResponse']['DescribeDBInstancesResult']['DBInstances'][0]['AllocatedStorage'].should.equal('10')
conn.modify_db_instance(db_instance_identifier='db-master-1', allocated_storage=20, apply_immediately=True) conn.modify_db_instance(db_instance_identifier='db-master-1', allocated_storage=20, apply_immediately=True)
instances = conn.describe_db_instances('db-master-1') instances = conn.describe_db_instances('db-master-1')
instances['DescribeDBInstanceResponse']['DescribeDBInstanceResult'][0]['DBInstance']['AllocatedStorage'].should.equal('20') instances['DescribeDBInstancesResponse']['DescribeDBInstancesResult']['DBInstances'][0]['AllocatedStorage'].should.equal('20')
@disable_on_py3() @disable_on_py3()
@ -118,7 +118,7 @@ def test_reboot_non_existant_database():
def test_delete_database(): def test_delete_database():
conn = boto.rds2.connect_to_region("us-west-2") conn = boto.rds2.connect_to_region("us-west-2")
instances = conn.describe_db_instances() instances = conn.describe_db_instances()
list(instances['DescribeDBInstanceResponse']['DescribeDBInstanceResult']).should.have.length_of(0) list(instances['DescribeDBInstancesResponse']['DescribeDBInstancesResult']['DBInstances']).should.have.length_of(0)
conn.create_db_instance(db_instance_identifier='db-master-1', conn.create_db_instance(db_instance_identifier='db-master-1',
allocated_storage=10, allocated_storage=10,
engine='postgres', engine='postgres',
@ -127,11 +127,11 @@ def test_delete_database():
master_user_password='hunter2', master_user_password='hunter2',
db_security_groups=["my_sg"]) db_security_groups=["my_sg"])
instances = conn.describe_db_instances() instances = conn.describe_db_instances()
list(instances['DescribeDBInstanceResponse']['DescribeDBInstanceResult']).should.have.length_of(1) list(instances['DescribeDBInstancesResponse']['DescribeDBInstancesResult']['DBInstances']).should.have.length_of(1)
conn.delete_db_instance("db-master-1") conn.delete_db_instance("db-master-1")
instances = conn.describe_db_instances() instances = conn.describe_db_instances()
list(instances['DescribeDBInstanceResponse']['DescribeDBInstanceResult']).should.have.length_of(0) list(instances['DescribeDBInstancesResponse']['DescribeDBInstancesResult']['DBInstances']).should.have.length_of(0)
@disable_on_py3() @disable_on_py3()