x/rsd-lib
Code Issues Proposed changes

Replace assertRaisesRegexp with assertRaisesRegex

Browse Source 
This replaces the deprecated (in python 3.2) unittest.TestCase
method assertRaisesRegexp() with assertRaisesRegex().

Change-Id: I8c4e863faa4e1f1ef5652ecea7780e240e2d617f
Signed-off-by: Chuck Short <chucks@redhat.com>
This commit is contained in:
Chuck Short 2018-08-27 10:58:34 -04:00
parent 0792c51625
commit 5db9a878e7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsd_lib/tests/unit/resources/v2_3/fabric/test_endpoint.py
View File

@ -164,7 +164,7 @@ class EndpointTestCase(testtools.TestCase):
}) })
def test_update_authentication_with_invalid_parameter(self): def test_update_authentication_with_invalid_parameter(self):
with self.assertRaisesRegexp( with self.assertRaisesRegex(
ValueError, ValueError,
'At least "username" or "password" parameter has to be specified'): 'At least "username" or "password" parameter has to be specified'):
self.endpoint_inst.update_authentication() self.endpoint_inst.update_authentication()

8
rsd_lib/tests/unit/resources/v2_3/storage_service/test_volume.py
View File

@ -112,17 +112,17 @@ class StorageServiceTestCase(testtools.TestCase):
"Erased": True}}}) "Erased": True}}})
def test_update_volume_with_invalid_parameter(self): def test_update_volume_with_invalid_parameter(self):
with self.assertRaisesRegexp( with self.assertRaisesRegex(
ValueError, ValueError,
'At least "bootable" or "erased" parameter has to be specified'): 'At least "bootable" or "erased" parameter has to be specified'):
self.volume_inst.update() self.volume_inst.update()
with self.assertRaisesRegexp( with self.assertRaisesRegex(
exceptions.InvalidParameterValueError, exceptions.InvalidParameterValueError,
'The parameter "bootable" value "fake-value" is invalid'): 'The parameter "bootable" value "fake-value" is invalid'):
self.volume_inst.update(bootable='fake-value') self.volume_inst.update(bootable='fake-value')
with self.assertRaisesRegexp( with self.assertRaisesRegex(
exceptions.InvalidParameterValueError, exceptions.InvalidParameterValueError,
'The parameter "erased" value "fake-value" is invalid'): 'The parameter "erased" value "fake-value" is invalid'):
self.volume_inst.update(bootable=True, erased='fake-value') self.volume_inst.update(bootable=True, erased='fake-value')
@ -148,7 +148,7 @@ class StorageServiceTestCase(testtools.TestCase):
data={"InitializeType": "Slow"}) data={"InitializeType": "Slow"})
def test_initialize_with_invalid_parameter(self): def test_initialize_with_invalid_parameter(self):
with self.assertRaisesRegexp( with self.assertRaisesRegex(
exceptions.InvalidParameterValueError, exceptions.InvalidParameterValueError,
'The parameter "init_type" value "fake-value" is invalid' 'The parameter "init_type" value "fake-value" is invalid'
'.*[\'Fast\', \'Slow\']'): '.*[\'Fast\', \'Slow\']'):