Merge "Replace assertRaisesRegexp with assertRaisesRegex"
This commit is contained in:
commit
8ec6bb837e
|
@ -47,8 +47,8 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
params = ('{"name": "MyDocker", "image": "ubuntu",'
|
||||
'"command": "env", "memory": "512",'
|
||||
'"environment": {"key1": "val1", "key2": "val2"}}')
|
||||
with self.assertRaisesRegexp(AppError,
|
||||
"Invalid input for query parameters"):
|
||||
with self.assertRaisesRegex(AppError,
|
||||
"Invalid input for query parameters"):
|
||||
self.app.post('/v1/containers?run=xyz', params=params,
|
||||
content_type='application/json')
|
||||
|
||||
|
@ -100,8 +100,8 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
params = ('{"name": "MyDocker",'
|
||||
'"command": "env", "memory": "512",'
|
||||
'"environment": {"key1": "val1", "key2": "val2"}}')
|
||||
with self.assertRaisesRegexp(AppError,
|
||||
"is a required property"):
|
||||
with self.assertRaisesRegex(AppError,
|
||||
"is a required property"):
|
||||
self.app.post('/v1/containers/',
|
||||
params=params,
|
||||
content_type='application/json')
|
||||
|
@ -434,7 +434,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
'"command": "env", "memory": "512",'
|
||||
'"restart_policy": {"Name": "always",'
|
||||
'"MaximumRetryCount": "1"}}')
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError, "maximum retry count not valid with"):
|
||||
self.app.post('/v1/containers/',
|
||||
params=params,
|
||||
|
@ -635,8 +635,8 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
container_uuid = test_container.get('uuid')
|
||||
|
||||
params = {'name': value}
|
||||
with self.assertRaisesRegexp(AppError,
|
||||
"Invalid input for query parameters"):
|
||||
with self.assertRaisesRegex(AppError,
|
||||
"Invalid input for query parameters"):
|
||||
self.app.post('/v1/containers/%s/rename' %
|
||||
container_uuid, params=params)
|
||||
|
||||
|
@ -654,7 +654,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
uuid = uuidutils.generate_uuid()
|
||||
test_object = utils.create_test_container(context=self.context,
|
||||
uuid=uuid, status='Running')
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError, "Cannot start container %s in Running state" % uuid):
|
||||
self.app.post('/v1/containers/%s/%s/' % (test_object.uuid,
|
||||
'start'))
|
||||
|
@ -676,8 +676,8 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
mock_container_stop,
|
||||
mock_validate):
|
||||
test_container = utils.get_test_container()
|
||||
with self.assertRaisesRegexp(AppError,
|
||||
"Invalid input for query parameters"):
|
||||
with self.assertRaisesRegex(AppError,
|
||||
"Invalid input for query parameters"):
|
||||
self._action_test(test_container, 'stop', 'name',
|
||||
mock_container_stop, 202,
|
||||
query_param='timeout=xyz')
|
||||
|
@ -686,7 +686,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
uuid = uuidutils.generate_uuid()
|
||||
test_object = utils.create_test_container(context=self.context,
|
||||
uuid=uuid, status='Stopped')
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError, "Cannot stop container %s in Stopped state" % uuid):
|
||||
self.app.post('/v1/containers/%s/%s/' % (test_object.uuid,
|
||||
'stop'))
|
||||
|
@ -705,7 +705,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
uuid = uuidutils.generate_uuid()
|
||||
test_object = utils.create_test_container(context=self.context,
|
||||
uuid=uuid, status='Stopped')
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError, "Cannot pause container %s in Stopped state" % uuid):
|
||||
self.app.post('/v1/containers/%s/%s/' % (test_object.uuid,
|
||||
'pause'))
|
||||
|
@ -724,7 +724,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
uuid = uuidutils.generate_uuid()
|
||||
test_object = utils.create_test_container(context=self.context,
|
||||
uuid=uuid, status='Running')
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError,
|
||||
"Cannot unpause container %s in Running state" % uuid):
|
||||
self.app.post('/v1/containers/%s/%s/' % (test_object.uuid,
|
||||
|
@ -745,7 +745,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
uuid = uuidutils.generate_uuid()
|
||||
test_object = utils.create_test_container(context=self.context,
|
||||
uuid=uuid, status='Paused')
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError, "Cannot reboot container %s in Paused state" % uuid):
|
||||
self.app.post('/v1/containers/%s/%s/' % (test_object.uuid,
|
||||
'reboot'))
|
||||
|
@ -755,8 +755,8 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
def test_reboot_by_name_wrong_timeout_value(self, mock_container_reboot,
|
||||
mock_validate):
|
||||
test_container = utils.get_test_container()
|
||||
with self.assertRaisesRegexp(AppError,
|
||||
"Invalid input for query parameters"):
|
||||
with self.assertRaisesRegex(AppError,
|
||||
"Invalid input for query parameters"):
|
||||
self._action_test(test_container, 'reboot', 'name',
|
||||
mock_container_reboot, 202,
|
||||
query_param='timeout=xyz')
|
||||
|
@ -828,7 +828,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
uuid = uuidutils.generate_uuid()
|
||||
test_object = utils.create_test_container(context=self.context,
|
||||
uuid=uuid, status='Creating')
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError,
|
||||
"Cannot logs container %s in Creating state" % uuid):
|
||||
self.app.get('/v1/containers/%s/logs/' % test_object.uuid)
|
||||
|
@ -856,7 +856,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
test_object = utils.create_test_container(context=self.context,
|
||||
uuid=uuid, status='Stopped')
|
||||
cmd = {'command': 'ls'}
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError,
|
||||
"Cannot execute container %s in Stopped state" % uuid):
|
||||
self.app.post('/v1/containers/%s/%s/' % (test_object.uuid,
|
||||
|
@ -901,7 +901,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
uuid = uuidutils.generate_uuid()
|
||||
test_object = utils.create_test_container(context=self.context,
|
||||
uuid=uuid, status='Running')
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError,
|
||||
"Cannot delete container %s in Running state" % uuid):
|
||||
self.app.delete('/v1/containers/%s' % (test_object.uuid))
|
||||
|
@ -910,7 +910,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
uuid = uuidutils.generate_uuid()
|
||||
test_object = utils.create_test_container(context=self.context,
|
||||
uuid=uuid, status='Paused')
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError,
|
||||
"Cannot delete_force container %s in Paused state" % uuid):
|
||||
self.app.delete('/v1/containers/%s?force=True' % test_object.uuid)
|
||||
|
@ -965,7 +965,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
test_object = utils.create_test_container(context=self.context,
|
||||
uuid=uuid, status='Stopped')
|
||||
body = {'signal': 9}
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError, "Cannot kill container %s in Stopped state" % uuid):
|
||||
self.app.post('/v1/containers/%s/%s/' % (test_object.uuid,
|
||||
'kill'), body)
|
||||
|
@ -1020,7 +1020,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
|
||||
container_uuid = test_container.get('uuid')
|
||||
params = {'signal': value}
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError, "Bad response: 400 Bad Request"):
|
||||
self.app.post('/v1/containers/%s/kill/' %
|
||||
container_uuid, params)
|
||||
|
@ -1177,7 +1177,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
uuid = uuidutils.generate_uuid()
|
||||
test_object = utils.create_test_container(context=self.context,
|
||||
uuid=uuid, status='Error')
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError,
|
||||
"Cannot get_archive container %s in Error state" % uuid):
|
||||
self.app.get('/v1/containers/%s/%s/' % (test_object.uuid,
|
||||
|
@ -1208,7 +1208,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
uuid = uuidutils.generate_uuid()
|
||||
test_object = utils.create_test_container(context=self.context,
|
||||
uuid=uuid, status='Error')
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError,
|
||||
"Cannot put_archive container %s in Error state" % uuid):
|
||||
self.app.post('/v1/containers/%s/%s/' % (test_object.uuid,
|
||||
|
@ -1276,7 +1276,7 @@ class TestContainerController(api_base.FunctionalTest):
|
|||
cmd = {'repository': 'repo', 'tag': 'tag'}
|
||||
utils.create_test_container(context=self.context,
|
||||
uuid=uuid, status='Error')
|
||||
with self.assertRaisesRegexp(
|
||||
with self.assertRaisesRegex(
|
||||
AppError, "Cannot commit container %s in Error state" % uuid):
|
||||
self.app.post('/v1/containers/%s/commit/' % uuid, cmd)
|
||||
|
||||
|
|
|
@ -46,8 +46,8 @@ class TestImageController(api_base.FunctionalTest):
|
|||
@patch('zun.compute.api.API.image_pull')
|
||||
def test_image_pull_with_no_repo(self, mock_image_pull):
|
||||
params = {}
|
||||
with self.assertRaisesRegexp(AppError,
|
||||
"is a required property"):
|
||||
with self.assertRaisesRegex(AppError,
|
||||
"is a required property"):
|
||||
self.app.post('/v1/images/',
|
||||
params=params,
|
||||
content_type='application/json')
|
||||
|
@ -176,15 +176,15 @@ class TestImageController(api_base.FunctionalTest):
|
|||
@patch('zun.compute.api.API.image_search')
|
||||
def test_search_image_with_exact_match_wrong(self, mock_image_search):
|
||||
mock_image_search.side_effect = exception.InvalidValue
|
||||
with self.assertRaisesRegexp(AppError,
|
||||
"Invalid input for query parameters"):
|
||||
with self.assertRaisesRegex(AppError,
|
||||
"Invalid input for query parameters"):
|
||||
self.app.get('/v1/images/redis/search?exact_match=wrong')
|
||||
|
||||
@patch('zun.compute.api.API.image_search')
|
||||
def test_search_image_with_image_driver_wrong(self, mock_image_search):
|
||||
mock_image_search.side_effect = exception.InvalidValue
|
||||
with self.assertRaisesRegexp(AppError,
|
||||
"Invalid input for query parameters"):
|
||||
with self.assertRaisesRegex(AppError,
|
||||
"Invalid input for query parameters"):
|
||||
self.app.get('/v1/images/redis/search?image_driver=wrong')
|
||||
|
||||
|
||||
|
|
|
@ -22,25 +22,25 @@ class TestUtils(base.BaseTestCase):
|
|||
self.assertEqual(1000, utils.validate_limit(None))
|
||||
self.assertEqual(1000, utils.validate_limit(1001))
|
||||
self.assertEqual(50, utils.validate_limit(50))
|
||||
with self.assertRaisesRegexp(wsme.exc.ClientSideError,
|
||||
"Limit must be positive"):
|
||||
with self.assertRaisesRegex(wsme.exc.ClientSideError,
|
||||
"Limit must be positive"):
|
||||
utils.validate_limit(-1)
|
||||
with self.assertRaisesRegexp(wsme.exc.ClientSideError,
|
||||
"Limit must be positive"):
|
||||
with self.assertRaisesRegex(wsme.exc.ClientSideError,
|
||||
"Limit must be positive"):
|
||||
utils.validate_limit(0)
|
||||
with self.assertRaisesRegexp(wsme.exc.ClientSideError,
|
||||
"Limit must be positive integer"):
|
||||
with self.assertRaisesRegex(wsme.exc.ClientSideError,
|
||||
"Limit must be positive integer"):
|
||||
utils.validate_limit('a')
|
||||
with self.assertRaisesRegexp(wsme.exc.ClientSideError,
|
||||
"Limit must be positive integer"):
|
||||
with self.assertRaisesRegex(wsme.exc.ClientSideError,
|
||||
"Limit must be positive integer"):
|
||||
utils.validate_limit('5.5')
|
||||
|
||||
def test_validate_sort_dir(self):
|
||||
self.assertEqual('asc', utils.validate_sort_dir('asc'))
|
||||
self.assertEqual('desc', utils.validate_sort_dir('desc'))
|
||||
with self.assertRaisesRegexp(wsme.exc.ClientSideError,
|
||||
"Invalid sort direction"):
|
||||
with self.assertRaisesRegex(wsme.exc.ClientSideError,
|
||||
"Invalid sort direction"):
|
||||
utils.validate_sort_dir(None)
|
||||
with self.assertRaisesRegexp(wsme.exc.ClientSideError,
|
||||
"Invalid sort direction"):
|
||||
with self.assertRaisesRegex(wsme.exc.ClientSideError,
|
||||
"Invalid sort direction"):
|
||||
utils.validate_sort_dir('abc')
|
||||
|
|
|
@ -79,21 +79,21 @@ class TestUtils(base.TestCase):
|
|||
def test_validate_container_state(self):
|
||||
container = Container(self.context, **db_utils.get_test_container())
|
||||
container.status = 'Stopped'
|
||||
with self.assertRaisesRegexp(exception.InvalidStateException,
|
||||
"%s" % container.uuid):
|
||||
with self.assertRaisesRegex(exception.InvalidStateException,
|
||||
"%s" % container.uuid):
|
||||
utils.validate_container_state(container, 'stop')
|
||||
with self.assertRaisesRegexp(exception.InvalidStateException,
|
||||
"%s" % container.uuid):
|
||||
with self.assertRaisesRegex(exception.InvalidStateException,
|
||||
"%s" % container.uuid):
|
||||
utils.validate_container_state(container, 'pause')
|
||||
container.status = 'Running'
|
||||
with self.assertRaisesRegexp(exception.InvalidStateException,
|
||||
"%s" % container.uuid):
|
||||
with self.assertRaisesRegex(exception.InvalidStateException,
|
||||
"%s" % container.uuid):
|
||||
utils.validate_container_state(container, 'start')
|
||||
with self.assertRaisesRegexp(exception.InvalidStateException,
|
||||
"%s" % container.uuid):
|
||||
with self.assertRaisesRegex(exception.InvalidStateException,
|
||||
"%s" % container.uuid):
|
||||
utils.validate_container_state(container, 'unpause')
|
||||
with self.assertRaisesRegexp(exception.InvalidStateException,
|
||||
"%s" % container.uuid):
|
||||
with self.assertRaisesRegex(exception.InvalidStateException,
|
||||
"%s" % container.uuid):
|
||||
utils.validate_container_state(container, 'delete')
|
||||
self.assertIsNone(utils.validate_container_state(
|
||||
container, 'reboot'))
|
||||
|
|
|
@ -67,32 +67,32 @@ class TestSchemaValidations(base.BaseTestCase):
|
|||
|
||||
def test_create_schema_image_missing(self):
|
||||
request_to_validate = {'name': 'test1'}
|
||||
with self.assertRaisesRegexp(exception.SchemaValidationError,
|
||||
"'image' is a required property"):
|
||||
with self.assertRaisesRegex(exception.SchemaValidationError,
|
||||
"'image' is a required property"):
|
||||
self.schema_validator.validate(request_to_validate)
|
||||
|
||||
def test_create_schema_invalid_name(self):
|
||||
invalid_names = ['a@', 'a', "", '*' * 265, " ", " ", "a b", 'ab@']
|
||||
for value in invalid_names:
|
||||
request_to_validate = {'name': value, 'image': 'nginx'}
|
||||
with self.assertRaisesRegexp(exception.SchemaValidationError,
|
||||
"Invalid input for field 'name'"):
|
||||
with self.assertRaisesRegex(exception.SchemaValidationError,
|
||||
"Invalid input for field 'name'"):
|
||||
self.schema_validator.validate(request_to_validate)
|
||||
|
||||
def test_create_schema_invalid_memory(self):
|
||||
invalid_memory = ['2KG', 2.2, '0', 0, '2', 2]
|
||||
for value in invalid_memory:
|
||||
request_to_validate = {'memory': value, 'image': 'nginx'}
|
||||
with self.assertRaisesRegexp(exception.SchemaValidationError,
|
||||
"Invalid input for field 'memory'"):
|
||||
with self.assertRaisesRegex(exception.SchemaValidationError,
|
||||
"Invalid input for field 'memory'"):
|
||||
self.schema_validator.validate(request_to_validate)
|
||||
|
||||
def test_create_schema_invalid_image_pull_policy(self):
|
||||
request_to_validate = {'name': 'test1', 'image': 'nginx',
|
||||
'image_pull_policy': 'xyz'}
|
||||
with self.assertRaisesRegexp(exception.SchemaValidationError,
|
||||
"Invalid input for field "
|
||||
"'image_pull_policy'"):
|
||||
with self.assertRaisesRegex(exception.SchemaValidationError,
|
||||
"Invalid input for field "
|
||||
"'image_pull_policy'"):
|
||||
self.schema_validator.validate(request_to_validate)
|
||||
|
||||
def test_create_schema_valid_memory(self):
|
||||
|
@ -109,8 +109,8 @@ class TestSchemaValidations(base.BaseTestCase):
|
|||
self.schema_validator.validate(request_to_validate)
|
||||
for value in invalid_cpu:
|
||||
request_to_validate = {'cpu': value, 'image': 'nginx'}
|
||||
with self.assertRaisesRegexp(exception.SchemaValidationError,
|
||||
"Invalid input for field 'cpu'"):
|
||||
with self.assertRaisesRegex(exception.SchemaValidationError,
|
||||
"Invalid input for field 'cpu'"):
|
||||
self.schema_validator.validate(request_to_validate)
|
||||
|
||||
def test_create_schema_restart_policy_name(self):
|
||||
|
@ -125,8 +125,8 @@ class TestSchemaValidations(base.BaseTestCase):
|
|||
restart_policy = {'Name': value, 'MaximumRetryCount': '0'}
|
||||
request_to_validate = {'name': 'test1', 'image': 'nginx',
|
||||
'restart_policy': restart_policy}
|
||||
with self.assertRaisesRegexp(exception.SchemaValidationError,
|
||||
"Invalid input for field 'Name'"):
|
||||
with self.assertRaisesRegex(exception.SchemaValidationError,
|
||||
"Invalid input for field 'Name'"):
|
||||
self.schema_validator.validate(request_to_validate)
|
||||
|
||||
def test_create_schema_restart_policy_maxiumretrycount(self):
|
||||
|
@ -141,9 +141,9 @@ class TestSchemaValidations(base.BaseTestCase):
|
|||
restart_policy = {'Name': 'no', 'MaximumRetryCount': value}
|
||||
request_to_validate = {'name': 'test1', 'image': 'nginx',
|
||||
'restart_policy': restart_policy}
|
||||
with self.assertRaisesRegexp(exception.SchemaValidationError,
|
||||
"Invalid input for field "
|
||||
"'MaximumRetryCount'"):
|
||||
with self.assertRaisesRegex(exception.SchemaValidationError,
|
||||
"Invalid input for field "
|
||||
"'MaximumRetryCount'"):
|
||||
self.schema_validator.validate(request_to_validate)
|
||||
|
||||
def test_create_schema_restart_policy(self):
|
||||
|
@ -154,13 +154,13 @@ class TestSchemaValidations(base.BaseTestCase):
|
|||
restart_policy = {'MaximumRetryCount': 5}
|
||||
request_to_validate = {'name': 'test1', 'image': 'nginx',
|
||||
'restart_policy': restart_policy}
|
||||
with self.assertRaisesRegexp(exception.SchemaValidationError,
|
||||
"'Name' is a required property"):
|
||||
with self.assertRaisesRegex(exception.SchemaValidationError,
|
||||
"'Name' is a required property"):
|
||||
self.schema_validator.validate(request_to_validate)
|
||||
|
||||
def test_create_schema_wrong_image_driver(self):
|
||||
request_to_validate = {'image_driver': 'xyz', 'image': 'nginx'}
|
||||
with self.assertRaisesRegexp(exception.SchemaValidationError,
|
||||
"Invalid input for field"
|
||||
" 'image_driver'"):
|
||||
with self.assertRaisesRegex(exception.SchemaValidationError,
|
||||
"Invalid input for field"
|
||||
" 'image_driver'"):
|
||||
self.schema_validator.validate(request_to_validate)
|
||||
|
|
|
@ -37,8 +37,8 @@ class DbComputeNodeTestCase(base.DbTestCase):
|
|||
def test_create_compute_node_already_exists(self):
|
||||
utils.create_test_compute_node(
|
||||
context=self.context, uuid='123')
|
||||
with self.assertRaisesRegexp(exception.ComputeNodeAlreadyExists,
|
||||
'A compute node with UUID 123.*'):
|
||||
with self.assertRaisesRegex(exception.ComputeNodeAlreadyExists,
|
||||
'A compute node with UUID 123.*'):
|
||||
utils.create_test_compute_node(
|
||||
context=self.context, uuid='123')
|
||||
|
||||
|
|
|
@ -47,8 +47,8 @@ class DbContainerTestCase(base.DbTestCase):
|
|||
enforce_type=True)
|
||||
utils.create_test_container(context=self.context,
|
||||
uuid='123')
|
||||
with self.assertRaisesRegexp(exception.ContainerAlreadyExists,
|
||||
'A container with UUID 123.*'):
|
||||
with self.assertRaisesRegex(exception.ContainerAlreadyExists,
|
||||
'A container with UUID 123.*'):
|
||||
utils.create_test_container(context=self.context,
|
||||
uuid='123')
|
||||
|
||||
|
@ -57,8 +57,8 @@ class DbContainerTestCase(base.DbTestCase):
|
|||
group="compute",
|
||||
enforce_type=True)
|
||||
utils.create_test_container(context=self.context, name='cont1')
|
||||
with self.assertRaisesRegexp(exception.ContainerAlreadyExists,
|
||||
'A container with name.*'):
|
||||
with self.assertRaisesRegex(exception.ContainerAlreadyExists,
|
||||
'A container with name.*'):
|
||||
utils.create_test_container(uuid=uuidutils.generate_uuid(),
|
||||
context=self.context,
|
||||
name='cont1')
|
||||
|
@ -73,8 +73,8 @@ class DbContainerTestCase(base.DbTestCase):
|
|||
utils.create_test_container(context=self.context, name='cont1')
|
||||
self.context.project_id = 'fake_project_1'
|
||||
self.context.user_id = 'fake_user_1'
|
||||
with self.assertRaisesRegexp(exception.ContainerAlreadyExists,
|
||||
'A container with name.*'):
|
||||
with self.assertRaisesRegex(exception.ContainerAlreadyExists,
|
||||
'A container with name.*'):
|
||||
utils.create_test_container(uuid=uuidutils.generate_uuid(),
|
||||
context=self.context,
|
||||
name='cont1')
|
||||
|
@ -464,8 +464,8 @@ class EtcdDbContainerTestCase(base.DbTestCase):
|
|||
container1 = utils.create_test_container(
|
||||
context=self.context, name='cont1')
|
||||
mock_list_containers.return_value = [container1]
|
||||
with self.assertRaisesRegexp(exception.ContainerAlreadyExists,
|
||||
'A container with name.*'):
|
||||
with self.assertRaisesRegex(exception.ContainerAlreadyExists,
|
||||
'A container with name.*'):
|
||||
utils.create_test_container(uuid=uuidutils.generate_uuid(),
|
||||
context=self.context,
|
||||
name='cont1')
|
||||
|
@ -485,8 +485,8 @@ class EtcdDbContainerTestCase(base.DbTestCase):
|
|||
self.context.project_id = 'fake_project_1'
|
||||
self.context.user_id = 'fake_user_1'
|
||||
mock_list_containers.return_value = [container1]
|
||||
with self.assertRaisesRegexp(exception.ContainerAlreadyExists,
|
||||
'A container with name.*'):
|
||||
with self.assertRaisesRegex(exception.ContainerAlreadyExists,
|
||||
'A container with name.*'):
|
||||
utils.create_test_container(uuid=uuidutils.generate_uuid(),
|
||||
context=self.context,
|
||||
name='cont1')
|
||||
|
|
|
@ -35,8 +35,8 @@ class DbInventoryTestCase(base.DbTestCase):
|
|||
utils.create_test_inventory(
|
||||
context=self.context, resource_provider_id=1, resource_class_id=1)
|
||||
fields = {'resource_provider_id': 1, 'resource_class_id': 1}
|
||||
with self.assertRaisesRegexp(exception.UniqueConstraintViolated,
|
||||
'A resource with %s *' % fields):
|
||||
with self.assertRaisesRegex(exception.UniqueConstraintViolated,
|
||||
'A resource with %s *' % fields):
|
||||
utils.create_test_inventory(
|
||||
context=self.context, resource_provider_id=1,
|
||||
resource_class_id=1)
|
||||
|
|
|
@ -43,8 +43,8 @@ class DbResourceClassTestCase(base.DbTestCase):
|
|||
def test_create_resource_class_already_exists(self):
|
||||
utils.create_test_resource_class(
|
||||
context=self.context, uuid='123')
|
||||
with self.assertRaisesRegexp(exception.ResourceClassAlreadyExists,
|
||||
'A resource class with uuid 123.*'):
|
||||
with self.assertRaisesRegex(exception.ResourceClassAlreadyExists,
|
||||
'A resource class with uuid 123.*'):
|
||||
utils.create_test_resource_class(
|
||||
context=self.context, uuid='123')
|
||||
|
||||
|
|
|
@ -37,8 +37,8 @@ class DbResourceProviderTestCase(base.DbTestCase):
|
|||
def test_create_resource_provider_already_exists(self):
|
||||
utils.create_test_resource_provider(
|
||||
context=self.context, uuid='123')
|
||||
with self.assertRaisesRegexp(exception.ResourceProviderAlreadyExists,
|
||||
'A resource provider with UUID 123.*'):
|
||||
with self.assertRaisesRegex(exception.ResourceProviderAlreadyExists,
|
||||
'A resource provider with UUID 123.*'):
|
||||
utils.create_test_resource_provider(
|
||||
context=self.context, uuid='123')
|
||||
|
||||
|
|
Loading…
Reference in New Issue