From c6437930de0ca5d8959e8a39c8b6f03c8038668c Mon Sep 17 00:00:00 2001 From: Mike Fuller Date: Mon, 19 Jan 2015 08:06:37 +1100 Subject: [PATCH] fixed up tests for create_option_group, fixed return json to have major_version correct --- moto/rds2/models.py | 2 +- tests/test_rds2/test_rds2.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/moto/rds2/models.py b/moto/rds2/models.py index 8e1511177..67a865c7f 100644 --- a/moto/rds2/models.py +++ b/moto/rds2/models.py @@ -462,7 +462,7 @@ class OptionGroup(object): def to_json(self): template = Template("""{ "VpcId": null, - "MajorEngineVersion": "{{ option_group.engine_name }}", + "MajorEngineVersion": "{{ option_group.major_engine_version }}", "OptionGroupDescription": "{{ option_group.description }}", "AllowsVpcAndNonVpcInstanceMemberships": "{{ option_group.vpc_and_non_vpc_instance_memberships }}", "EngineName": "{{ option_group.engine_name }}", diff --git a/tests/test_rds2/test_rds2.py b/tests/test_rds2/test_rds2.py index cd4934eb4..dd44719e4 100644 --- a/tests/test_rds2/test_rds2.py +++ b/tests/test_rds2/test_rds2.py @@ -67,8 +67,11 @@ def test_describe_non_existant_database(): @mock_rds2 def test_create_option_group(): conn = boto.rds2.connect_to_region("us-west-2") - print conn.create_option_group('test', 'postgres', '9.3', 'test') - + option_group = conn.create_option_group('test', 'postgres', '9.3', 'test option group') + option_group['CreateOptionGroupResponse']['CreateOptionGroupResult']['OptionGroup']['OptionGroupName'].should.equal('test') + option_group['CreateOptionGroupResponse']['CreateOptionGroupResult']['OptionGroup']['EngineName'].should.equal('postgres') + option_group['CreateOptionGroupResponse']['CreateOptionGroupResult']['OptionGroup']['OptionGroupDescription'].should.equal('test option group') + option_group['CreateOptionGroupResponse']['CreateOptionGroupResult']['OptionGroup']['MajorEngineVersion'].should.equal('9.3') #@disable_on_py3() #@mock_rds2