openstack/python-cinderclient
Code Issues Proposed changes

Merge "Fix PY2/PY3 specific error in testcases"

Browse Source
This commit is contained in:
Jenkins 2017-06-15 16:39:50 +00:00 committed by Gerrit Code Review
commit 905f6f4a0f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinderclient/tests/functional/test_volume_extend_cli.py
View File

@ -27,7 +27,7 @@ class CinderVolumeExtendNegativeTests(base.ClientTestBase):
self.volume = self.object_create('volume', params='1') self.volume = self.object_create('volume', params='1')
@ddt.data( @ddt.data(
('', (r'too few arguments')), ('', (r'too few arguments|the following arguments are required')),
('-1', (r'New size for extend must be greater than current size')), ('-1', (r'New size for extend must be greater than current size')),
('0', (r'Invalid input received')), ('0', (r'Invalid input received')),
('size', (r'invalid int value')), ('size', (r'invalid int value')),
@ -43,7 +43,7 @@ class CinderVolumeExtendNegativeTests(base.ClientTestBase):
params='{0} {1}'.format(self.volume['id'], value)) params='{0} {1}'.format(self.volume['id'], value))
@ddt.data( @ddt.data(
('', (r'too few arguments')), ('', (r'too few arguments|the following arguments are required')),
('1234-1234-1234', (r'No volume with a name or ID of')), ('1234-1234-1234', (r'No volume with a name or ID of')),
('my_volume', (r'No volume with a name or ID of')), ('my_volume', (r'No volume with a name or ID of')),
('1234 1234', (r'unrecognized arguments')) ('1234 1234', (r'unrecognized arguments'))