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

Remove requires_boto_lte and add comment about StorageType vs storage_type

Browse Source
This commit is contained in:
Hugo Lopes Tavares 2015-02-03 16:57:12 -05:00
parent c40437398f
commit 7eb969fb00
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/helpers.py
View File

@ -26,19 +26,6 @@ class requires_boto_gte(object):
return skip_test return skip_test
class requires_boto_lte(object):
"""Decorator for requiring boto version lesser than or equal to 'version'"""
def __init__(self, version):
self.version = version
def __call__(self, test):
boto_version = version_tuple(boto.__version__)
required = version_tuple(self.version)
if boto_version <= required:
return test
return skip_test
class disable_on_py3(object): class disable_on_py3(object):
def __call__(self, test): def __call__(self, test):
if not six.PY3: if not six.PY3:

4
tests/test_rds/test_rds.py
View File

@ -6,7 +6,7 @@ from boto.exception import BotoServerError
import sure # noqa import sure # noqa
from moto import mock_ec2, mock_rds from moto import mock_ec2, mock_rds
from tests.helpers import disable_on_py3, requires_boto_lte from tests.helpers import disable_on_py3
@disable_on_py3() @disable_on_py3()
@ -259,7 +259,6 @@ def test_connecting_to_us_east_1():
database.security_groups[0].name.should.equal('my_sg') database.security_groups[0].name.should.equal('my_sg')
@requires_boto_lte('2.36.0')
@disable_on_py3() @disable_on_py3()
@mock_rds @mock_rds
def test_create_database_with_iops(): def test_create_database_with_iops():
@ -269,4 +268,5 @@ def test_create_database_with_iops():
database.status.should.equal('available') database.status.should.equal('available')
database.iops.should.equal(6000) database.iops.should.equal(6000)
# boto>2.36.0 may change the following property name to `storage_type`
database.StorageType.should.equal('io1') database.StorageType.should.equal('io1')