valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix boto_vpc unit test and error message

Browse Source
This commit is contained in:
Justin Findlay 2015-03-23 19:48:53 -06:00
parent 2a8ee17efb
commit ebbb113f7a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/boto_vpc.py
View File

@ -391,7 +391,7 @@ def subnet_exists(subnet_id=None, name=None, cidr=None, tags=None, zones=None,
if not any((subnet_id, name, cidr, tags, zones)):
raise SaltInvocationError('At least on of the following must be '
'specified: subnet id, cidr, name , tags '
'specified: subnet id, cidr, name, tags, '
'or zones.')
try:

3
tests/unit/modules/boto_vpc_test.py
View File

@ -681,7 +681,8 @@ class BotoVpcSubnetsTestCase(BotoVpcTestCaseBase):
'''
Tests checking subnet existence without any filters
'''
with self.assertRaisesRegexp(SaltInvocationError, 'At least on of the following must be specified: subnet id, name or tags.'):
with self.assertRaisesRegexp(SaltInvocationError,
'At least on of the following must be specified: subnet id, cidr, name, tags, or zones.'):
boto_vpc.subnet_exists(**conn_parameters)