Replace assertRaisesRegexp with assertRaisesRegex
This replaces the deprecated (in python 3.2) unittest.TestCase method assertRaisesRegexp() with assertRaisesRegex() Change-Id: I405875738337433a36cba78023534615dea8b7b6
This commit is contained in:
parent
7e8c9a9c26
commit
e596c96611
|
@ -481,7 +481,7 @@ class VolumeTest(vt_base.BaseVolumeTest):
|
|||
stack = utils.parse_stack(self.t, stack_name=stack_name)
|
||||
rsrc = self.create_volume(self.t, stack, 'DataVolume')
|
||||
deleter = scheduler.TaskRunner(rsrc.destroy)
|
||||
self.assertRaisesRegexp(exception.ResourceFailure,
|
||||
self.assertRaisesRegex(exception.ResourceFailure,
|
||||
".*ResourceInError.*error_deleting.*delete",
|
||||
deleter)
|
||||
|
||||
|
|
|
@ -401,7 +401,7 @@ class AodhAlarmTest(common.HeatTestCase):
|
|||
msg = ("Property error: Resources.MEMAlarmHigh.Properties.%s: "
|
||||
"int\(\) argument must be a string(, a bytes-like "
|
||||
"object)? or a number, not 'list'" % p)
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg, rsrc.validate)
|
||||
|
||||
def test_mem_alarm_high_check_not_required_parameters(self):
|
||||
|
|
|
@ -170,7 +170,7 @@ class TestContainer(common.HeatTestCase):
|
|||
defn = rsrc_defn.ResourceDefinition(
|
||||
'failed_container', 'OS::Barbican::GenericContainer', props)
|
||||
res = container.GenericContainer('foo', defn, stack)
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
'Duplicate refs are not allowed',
|
||||
res.validate)
|
||||
|
||||
|
|
|
@ -87,7 +87,7 @@ class TestOrder(common.HeatTestCase):
|
|||
del props['type']
|
||||
snippet = self.res_template.freeze(properties=props)
|
||||
|
||||
self.assertRaisesRegexp(exception.ResourceFailure,
|
||||
self.assertRaisesRegex(exception.ResourceFailure,
|
||||
'Property type not assigned',
|
||||
self._create_resource,
|
||||
'foo',
|
||||
|
@ -101,7 +101,7 @@ class TestOrder(common.HeatTestCase):
|
|||
res = self._create_resource('test', snippet, self.stack)
|
||||
msg = ("Properties algorithm and bit_length are required for "
|
||||
"key type of order.")
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg,
|
||||
res.validate)
|
||||
|
||||
|
@ -112,7 +112,7 @@ class TestOrder(common.HeatTestCase):
|
|||
snippet = self.res_template.freeze(properties=props)
|
||||
res = self._create_resource('test', snippet, self.stack)
|
||||
msg = ("profile cannot be specified without ca_id.")
|
||||
self.assertRaisesRegexp(exception.ResourcePropertyDependency,
|
||||
self.assertRaisesRegex(exception.ResourcePropertyDependency,
|
||||
msg,
|
||||
res.validate)
|
||||
|
||||
|
@ -124,7 +124,7 @@ class TestOrder(common.HeatTestCase):
|
|||
msg = ("Unexpected properties: pass_phrase. Only these properties "
|
||||
"are allowed for key type of order: algorithm, "
|
||||
"bit_length, expiration, mode, name, payload_content_type.")
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg,
|
||||
res.validate)
|
||||
|
||||
|
@ -137,7 +137,7 @@ class TestOrder(common.HeatTestCase):
|
|||
"these properties are allowed for certificate type of order: "
|
||||
"ca_id, name, profile, request_data, request_type, "
|
||||
"source_container_ref, subject_dn.")
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg,
|
||||
res.validate)
|
||||
|
||||
|
@ -150,7 +150,7 @@ class TestOrder(common.HeatTestCase):
|
|||
msg = ("Unexpected properties: subject_dn. Only these properties are "
|
||||
"allowed for asymmetric type of order: algorithm, bit_length, "
|
||||
"expiration, mode, name, pass_phrase, payload_content_type")
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg,
|
||||
res.validate)
|
||||
|
||||
|
|
|
@ -145,7 +145,7 @@ class TestSecret(common.HeatTestCase):
|
|||
props)
|
||||
res = self._create_resource(defn.name, defn, self.stack)
|
||||
msg = "payload_content_type cannot be specified without payload."
|
||||
self.assertRaisesRegexp(exception.ResourcePropertyDependency,
|
||||
self.assertRaisesRegex(exception.ResourcePropertyDependency,
|
||||
msg, res.validate)
|
||||
|
||||
def test_validate_octet_stream_without_encoding(self):
|
||||
|
@ -161,7 +161,7 @@ class TestSecret(common.HeatTestCase):
|
|||
msg = ("Property unspecified. For 'application/octet-stream' value of "
|
||||
"'payload_content_type' property, 'payload_content_encoding' "
|
||||
"property must be specified.")
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg, res.validate)
|
||||
|
||||
def test_validate_base64(self):
|
||||
|
@ -177,7 +177,7 @@ class TestSecret(common.HeatTestCase):
|
|||
res = self._create_resource(defn.name, defn, self.stack)
|
||||
msg = ("Invalid payload for specified 'base64' value of "
|
||||
"'payload_content_encoding' property.")
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg, res.validate)
|
||||
|
||||
def test_validate_encoding_dependency(self):
|
||||
|
@ -194,5 +194,5 @@ class TestSecret(common.HeatTestCase):
|
|||
msg = ("payload_content_encoding property should only be specified "
|
||||
"for payload_content_type with value "
|
||||
"application/octet-stream.")
|
||||
self.assertRaisesRegexp(exception.ResourcePropertyValueDependency,
|
||||
self.assertRaisesRegex(exception.ResourcePropertyValueDependency,
|
||||
msg, res.validate)
|
||||
|
|
|
@ -109,7 +109,7 @@ class CinderQuotaTest(common.HeatTestCase):
|
|||
my_quota.reparse()
|
||||
msg = ('At least one of the following properties must be specified: '
|
||||
'gigabytes, snapshots, volumes.')
|
||||
self.assertRaisesRegexp(exception.PropertyUnspecifiedError, msg,
|
||||
self.assertRaisesRegex(exception.PropertyUnspecifiedError, msg,
|
||||
my_quota.validate)
|
||||
|
||||
def test_quota_handle_create(self):
|
||||
|
|
|
@ -227,7 +227,7 @@ class ManilaShareTest(common.HeatTestCase):
|
|||
properties = tmp['resources']['test_share']['properties']
|
||||
properties['access_rules'][0]['access_type'] = 'domain'
|
||||
stack = utils.parse_stack(tmp, stack_name='access_type')
|
||||
self.assertRaisesRegexp(
|
||||
self.assertRaisesRegex(
|
||||
exception.StackValidationFailed,
|
||||
".* \"domain\" is not an allowed value \[ip, user, cert, cephx\]",
|
||||
stack.validate)
|
||||
|
|
|
@ -167,7 +167,7 @@ class ManilaShareNetworkTest(common.HeatTestCase):
|
|||
net.is_using_neutron = mock.Mock(return_value=True)
|
||||
msg = ('Provided neutron_subnet does not belong '
|
||||
'to provided neutron_network.')
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed, msg,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed, msg,
|
||||
net.validate)
|
||||
|
||||
def test_update(self):
|
||||
|
@ -227,7 +227,7 @@ class ManilaShareNetworkTest(common.HeatTestCase):
|
|||
net = self._create_network('share_network', rsrc_defn, stack)
|
||||
msg = ('Cannot define the following properties at the same time: '
|
||||
'neutron_network, nova_network.')
|
||||
self.assertRaisesRegexp(exception.ResourcePropertyConflict, msg,
|
||||
self.assertRaisesRegex(exception.ResourcePropertyConflict, msg,
|
||||
net.validate)
|
||||
|
||||
def test_nova_net_neutron_subnet_conflict(self):
|
||||
|
@ -239,7 +239,7 @@ class ManilaShareNetworkTest(common.HeatTestCase):
|
|||
net = self._create_network('share_network', rsrc_defn, stack)
|
||||
msg = ('Cannot define the following properties at the same time: '
|
||||
'neutron_subnet, nova_network.')
|
||||
self.assertRaisesRegexp(exception.ResourcePropertyConflict, msg,
|
||||
self.assertRaisesRegex(exception.ResourcePropertyConflict, msg,
|
||||
net.validate)
|
||||
|
||||
def test_nova_net_while_using_neutron(self):
|
||||
|
@ -253,7 +253,7 @@ class ManilaShareNetworkTest(common.HeatTestCase):
|
|||
net.is_using_neutron = mock.Mock(return_value=True)
|
||||
msg = ('With Neutron enabled you need to pass Neutron network '
|
||||
'and Neutron subnet instead of Nova network')
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed, msg,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed, msg,
|
||||
net.validate)
|
||||
|
||||
def test_neutron_net_without_neutron_subnet(self):
|
||||
|
@ -263,7 +263,7 @@ class ManilaShareNetworkTest(common.HeatTestCase):
|
|||
rsrc_defn = stack.t.resource_definitions(stack)['share_network']
|
||||
net = self._create_network('share_network', rsrc_defn, stack)
|
||||
msg = ('neutron_network cannot be specified without neutron_subnet.')
|
||||
self.assertRaisesRegexp(exception.ResourcePropertyDependency, msg,
|
||||
self.assertRaisesRegex(exception.ResourcePropertyDependency, msg,
|
||||
net.validate)
|
||||
|
||||
def test_attributes(self):
|
||||
|
|
|
@ -101,7 +101,7 @@ class MistralCronTriggerTest(common.HeatTestCase):
|
|||
ct = self._create_resource('trigger', self.rsrc_defn, self.stack)
|
||||
msg = ("At least one of the following properties must be specified: "
|
||||
"pattern, first_time")
|
||||
self.assertRaisesRegexp(exception.PropertyUnspecifiedError, msg,
|
||||
self.assertRaisesRegex(exception.PropertyUnspecifiedError, msg,
|
||||
ct.validate)
|
||||
|
||||
def test_validate_ok_without_first_time(self):
|
||||
|
|
|
@ -62,7 +62,7 @@ class L7PolicyTest(common.HeatTestCase):
|
|||
'required when action type is set to REJECT.')
|
||||
with mock.patch('heat.engine.clients.os.neutron.NeutronClientPlugin.'
|
||||
'has_extension', return_value=True):
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg, self.l7policy.validate)
|
||||
|
||||
def test_validate_redirect_pool_action_with_url(self):
|
||||
|
@ -76,7 +76,7 @@ class L7PolicyTest(common.HeatTestCase):
|
|||
'for action with value REDIRECT_TO_URL.')
|
||||
with mock.patch('heat.engine.clients.os.neutron.NeutronClientPlugin.'
|
||||
'has_extension', return_value=True):
|
||||
self.assertRaisesRegexp(exception.ResourcePropertyValueDependency,
|
||||
self.assertRaisesRegex(exception.ResourcePropertyValueDependency,
|
||||
msg, self.l7policy.validate)
|
||||
|
||||
def test_validate_redirect_pool_action_without_pool(self):
|
||||
|
@ -90,7 +90,7 @@ class L7PolicyTest(common.HeatTestCase):
|
|||
'is set to REDIRECT_TO_POOL.')
|
||||
with mock.patch('heat.engine.clients.os.neutron.NeutronClientPlugin.'
|
||||
'has_extension', return_value=True):
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg, self.l7policy.validate)
|
||||
|
||||
def test_validate_redirect_url_action_with_pool(self):
|
||||
|
@ -103,7 +103,7 @@ class L7PolicyTest(common.HeatTestCase):
|
|||
'for action with value REDIRECT_TO_POOL.')
|
||||
with mock.patch('heat.engine.clients.os.neutron.NeutronClientPlugin.'
|
||||
'has_extension', return_value=True):
|
||||
self.assertRaisesRegexp(exception.ResourcePropertyValueDependency,
|
||||
self.assertRaisesRegex(exception.ResourcePropertyValueDependency,
|
||||
msg, self.l7policy.validate)
|
||||
|
||||
def test_validate_redirect_url_action_without_url(self):
|
||||
|
@ -116,7 +116,7 @@ class L7PolicyTest(common.HeatTestCase):
|
|||
'is set to REDIRECT_TO_URL.')
|
||||
with mock.patch('heat.engine.clients.os.neutron.NeutronClientPlugin.'
|
||||
'has_extension', return_value=True):
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg, self.l7policy.validate)
|
||||
|
||||
def test_create(self):
|
||||
|
|
|
@ -62,7 +62,7 @@ class L7RuleTest(common.HeatTestCase):
|
|||
'specified for rules of HEADER and COOKIE types.')
|
||||
with mock.patch('heat.engine.clients.os.neutron.NeutronClientPlugin.'
|
||||
'has_extension', return_value=True):
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg, self.l7rule.validate)
|
||||
|
||||
def test_create(self):
|
||||
|
|
|
@ -60,7 +60,7 @@ class PoolTest(common.HeatTestCase):
|
|||
'session_persistence type is set to APP_COOKIE.')
|
||||
with mock.patch('heat.engine.clients.os.neutron.NeutronClientPlugin.'
|
||||
'has_extension', return_value=True):
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg, self.pool.validate)
|
||||
|
||||
def test_validate_source_ip_cookie_name(self):
|
||||
|
@ -74,7 +74,7 @@ class PoolTest(common.HeatTestCase):
|
|||
'session_persistence type is set to SOURCE_IP.')
|
||||
with mock.patch('heat.engine.clients.os.neutron.NeutronClientPlugin.'
|
||||
'has_extension', return_value=True):
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg, self.pool.validate)
|
||||
|
||||
def test_create(self):
|
||||
|
|
|
@ -65,7 +65,7 @@ class RBACPolicyTest(common.HeatTestCase):
|
|||
tpl['resources']['rbac']['properties']['action'] = 'access_as_external'
|
||||
self._create_stack(tmpl=yaml.safe_dump(tpl))
|
||||
msg = "Invalid action access_as_external for object type network."
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed, msg,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed, msg,
|
||||
self.rbac.validate)
|
||||
|
||||
def test_validate_invalid_type(self):
|
||||
|
@ -73,7 +73,7 @@ class RBACPolicyTest(common.HeatTestCase):
|
|||
tpl['resources']['rbac']['properties']['object_type'] = 'networks'
|
||||
self._create_stack(tmpl=yaml.safe_dump(tpl))
|
||||
msg = "Invalid object_type: networks. "
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed, msg,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed, msg,
|
||||
self.rbac.validate)
|
||||
|
||||
def test_update(self):
|
||||
|
|
|
@ -92,7 +92,7 @@ class NeutronQuotaTest(common.HeatTestCase):
|
|||
msg = ('At least one of the following properties must be specified: '
|
||||
'floatingip, network, port, router, '
|
||||
'security_group, security_group_rule, subnet.')
|
||||
self.assertRaisesRegexp(exception.PropertyUnspecifiedError, msg,
|
||||
self.assertRaisesRegex(exception.PropertyUnspecifiedError, msg,
|
||||
my_quota.validate)
|
||||
|
||||
def test_quota_handle_create(self):
|
||||
|
|
|
@ -114,7 +114,7 @@ class NovaQuotaTest(common.HeatTestCase):
|
|||
'injected_file_path_bytes, injected_files, instances, '
|
||||
'key_pairs, metadata_items, ram, security_group_rules, '
|
||||
'security_groups, server_group_members, server_groups.')
|
||||
self.assertRaisesRegexp(exception.PropertyUnspecifiedError, msg,
|
||||
self.assertRaisesRegex(exception.PropertyUnspecifiedError, msg,
|
||||
my_quota.validate)
|
||||
|
||||
def test_quota_handle_create(self):
|
||||
|
|
|
@ -178,7 +178,7 @@ class ValidateTest(common.HeatTestCase):
|
|||
def test_validate_func(self):
|
||||
self.assertIsNone(function.validate(self.func))
|
||||
self.func = TestFunction(None, 'foo', ['bar'])
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
'.foo: Need more arguments',
|
||||
function.validate, self.func)
|
||||
|
||||
|
@ -188,7 +188,7 @@ class ValidateTest(common.HeatTestCase):
|
|||
|
||||
self.func = TestFunction(None, 'foo', ['bar'])
|
||||
snippet = {'foo': 'bar', 'blarg': self.func}
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
'.blarg.foo: Need more arguments',
|
||||
function.validate, snippet)
|
||||
|
||||
|
@ -198,7 +198,7 @@ class ValidateTest(common.HeatTestCase):
|
|||
|
||||
self.func = TestFunction(None, 'foo', ['bar'])
|
||||
snippet = {'foo': 'bar', 'blarg': self.func}
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
'.blarg.foo: Need more arguments',
|
||||
function.validate, snippet)
|
||||
|
||||
|
@ -208,7 +208,7 @@ class ValidateTest(common.HeatTestCase):
|
|||
|
||||
self.func = TestFunction(None, 'foo', ['bar'])
|
||||
snippet = {'foo': 'bar', 'blarg': self.func}
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
'.blarg.foo: Need more arguments',
|
||||
function.validate, snippet)
|
||||
|
||||
|
|
|
@ -1165,52 +1165,52 @@ class HOTemplateTest(common.HeatTestCase):
|
|||
{'keys': {'f2': 'f1'}}]}
|
||||
tmpl = template.Template(hot_newton_tpl_empty)
|
||||
msg = "key replacement f1 collides with a key in the input map"
|
||||
self.assertRaisesRegexp(ValueError, msg, self.resolve, snippet, tmpl)
|
||||
self.assertRaisesRegex(ValueError, msg, self.resolve, snippet, tmpl)
|
||||
|
||||
def test_map_replace_replaced_keys_collide(self):
|
||||
snippet = {'map_replace': [{'f1': 'b1', 'f2': 'b2'},
|
||||
{'keys': {'f1': 'f3', 'f2': 'f3'}}]}
|
||||
tmpl = template.Template(hot_newton_tpl_empty)
|
||||
msg = "key replacement f3 collides with a key in the output map"
|
||||
self.assertRaisesRegexp(ValueError, msg, self.resolve, snippet, tmpl)
|
||||
self.assertRaisesRegex(ValueError, msg, self.resolve, snippet, tmpl)
|
||||
|
||||
def test_map_replace_invalid_str_arg1(self):
|
||||
snippet = {'map_replace': 'ab'}
|
||||
tmpl = template.Template(hot_newton_tpl_empty)
|
||||
msg = "Incorrect arguments to \"map_replace\" should be:"
|
||||
self.assertRaisesRegexp(TypeError, msg, self.resolve, snippet, tmpl)
|
||||
self.assertRaisesRegex(TypeError, msg, self.resolve, snippet, tmpl)
|
||||
|
||||
def test_map_replace_invalid_str_arg2(self):
|
||||
snippet = {'map_replace': [{'f1': 'b1', 'f2': 'b2'}, "ab"]}
|
||||
tmpl = template.Template(hot_newton_tpl_empty)
|
||||
msg = ("Incorrect arguments: to \"map_replace\", "
|
||||
"arguments must be a list of maps")
|
||||
self.assertRaisesRegexp(TypeError, msg, self.resolve, snippet, tmpl)
|
||||
self.assertRaisesRegex(TypeError, msg, self.resolve, snippet, tmpl)
|
||||
|
||||
def test_map_replace_invalid_empty(self):
|
||||
snippet = {'map_replace': []}
|
||||
tmpl = template.Template(hot_newton_tpl_empty)
|
||||
msg = "Incorrect arguments to \"map_replace\" should be:"
|
||||
self.assertRaisesRegexp(TypeError, msg, self.resolve, snippet, tmpl)
|
||||
self.assertRaisesRegex(TypeError, msg, self.resolve, snippet, tmpl)
|
||||
|
||||
def test_map_replace_invalid_missing1(self):
|
||||
snippet = {'map_replace': [{'f1': 'b1', 'f2': 'b2'}]}
|
||||
tmpl = template.Template(hot_newton_tpl_empty)
|
||||
msg = "Incorrect arguments to \"map_replace\" should be:"
|
||||
self.assertRaisesRegexp(TypeError, msg, self.resolve, snippet, tmpl)
|
||||
self.assertRaisesRegex(TypeError, msg, self.resolve, snippet, tmpl)
|
||||
|
||||
def test_map_replace_invalid_missing2(self):
|
||||
snippet = {'map_replace': [{'keys': {'f1': 'f3', 'f2': 'f3'}}]}
|
||||
tmpl = template.Template(hot_newton_tpl_empty)
|
||||
msg = "Incorrect arguments to \"map_replace\" should be:"
|
||||
self.assertRaisesRegexp(TypeError, msg, self.resolve, snippet, tmpl)
|
||||
self.assertRaisesRegex(TypeError, msg, self.resolve, snippet, tmpl)
|
||||
|
||||
def test_map_replace_invalid_wrongkey(self):
|
||||
snippet = {'map_replace': [{'f1': 'b1', 'f2': 'b2'},
|
||||
{'notkeys': {'f2': 'F2'}}]}
|
||||
tmpl = template.Template(hot_newton_tpl_empty)
|
||||
msg = "Incorrect arguments to \"map_replace\" should be:"
|
||||
self.assertRaisesRegexp(ValueError, msg, self.resolve, snippet, tmpl)
|
||||
self.assertRaisesRegex(ValueError, msg, self.resolve, snippet, tmpl)
|
||||
|
||||
def test_yaql(self):
|
||||
snippet = {'yaql': {'expression': '$.data.var1.sum()',
|
||||
|
@ -1267,7 +1267,7 @@ class HOTemplateTest(common.HeatTestCase):
|
|||
snippet = {'yaql': 'invalid'}
|
||||
tmpl = template.Template(hot_newton_tpl_empty)
|
||||
msg = '.yaql: Arguments to "yaql" must be a map.'
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
msg, self.resolve, snippet, tmpl)
|
||||
|
||||
def test_yaql_invalid_expression(self):
|
||||
|
@ -1277,7 +1277,7 @@ class HOTemplateTest(common.HeatTestCase):
|
|||
yaql = tmpl.parse(None, snippet)
|
||||
regxp = ('.yaql: Bad expression Parse error: unexpected end '
|
||||
'of statement.')
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed, regxp,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed, regxp,
|
||||
function.validate, yaql)
|
||||
|
||||
def test_yaql_data_as_function(self):
|
||||
|
@ -1543,7 +1543,7 @@ conditions:
|
|||
repeat = tmpl.parse(None, snippet)
|
||||
regxp = ('.repeat: The "for_each" argument to "repeat" '
|
||||
'must contain a map')
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed, regxp,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed, regxp,
|
||||
function.validate, repeat)
|
||||
|
||||
def test_digest(self):
|
||||
|
@ -1795,7 +1795,7 @@ conditions:
|
|||
stack = parser.Stack(utils.dummy_context(), 'test_stack',
|
||||
template.Template(hot_juno_tpl_empty))
|
||||
regxp = '.Fn::GetAZs: The template version is invalid'
|
||||
self.assertRaisesRegexp(exception.StackValidationFailed,
|
||||
self.assertRaisesRegex(exception.StackValidationFailed,
|
||||
regxp,
|
||||
function.validate,
|
||||
stack.t.parse(stack, snippet))
|
||||
|
|
|
@ -781,7 +781,7 @@ class PropertyTest(common.HeatTestCase):
|
|||
p = properties.Property(schema)
|
||||
# python 3.4.3 returns another error message
|
||||
# try to handle this by regexp
|
||||
self.assertRaisesRegexp(
|
||||
self.assertRaisesRegex(
|
||||
TypeError, "int\(\) argument must be a string(, a bytes-like "
|
||||
"object)? or a number, not 'list'", p.get_value, [1])
|
||||
|
||||
|
|
|
@ -1870,7 +1870,7 @@ class StackTest(common.HeatTestCase):
|
|||
self.stack = stack.Stack(self.ctx, 'stack_with_correct_outputs',
|
||||
template.Template(tmpl))
|
||||
|
||||
self.assertRaisesRegexp(
|
||||
self.assertRaisesRegex(
|
||||
exception.StackValidationFailed,
|
||||
('Outputs.Resource_attr.Value.Fn::GetAtt: The Referenced '
|
||||
'Attribute \(AResource Bar\) is incorrect.'),
|
||||
|
@ -2233,7 +2233,7 @@ class StackTest(common.HeatTestCase):
|
|||
self.stack = stack.Stack(self.ctx, 'stack_with_correct_outputs',
|
||||
template.Template(tmpl))
|
||||
|
||||
self.assertRaisesRegexp(
|
||||
self.assertRaisesRegex(
|
||||
exception.StackValidationFailed,
|
||||
('outputs.resource_attr.value.get_attr: The Referenced Attribute '
|
||||
'\(AResource Bar\) is incorrect.'),
|
||||
|
|
Loading…
Reference in New Issue