assertEquals is deprecated, use assertEqual
Change-Id: If77b02e69d01e02db03ccb8613dcc327eb2844db
This commit is contained in:
parent
9ce68af5fb
commit
87eac1e268
@ -280,7 +280,7 @@ class LoadBalancerTest(HeatTestCase):
|
|||||||
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
||||||
self.lb_name,
|
self.lb_name,
|
||||||
expected)
|
expected)
|
||||||
self.assertEquals(rsrc.validate(), {
|
self.assertEqual(rsrc.validate(), {
|
||||||
'Error':
|
'Error':
|
||||||
'The halfClosed property is only available for the '
|
'The halfClosed property is only available for the '
|
||||||
'TCP or TCP_CLIENT_FIRST protocols'})
|
'TCP or TCP_CLIENT_FIRST protocols'})
|
||||||
@ -291,7 +291,7 @@ class LoadBalancerTest(HeatTestCase):
|
|||||||
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
||||||
self.lb_name,
|
self.lb_name,
|
||||||
expected)
|
expected)
|
||||||
self.assertEquals(rsrc.validate(), None)
|
self.assertEqual(rsrc.validate(), None)
|
||||||
|
|
||||||
#test TCP_CLIENT_FIRST protocol
|
#test TCP_CLIENT_FIRST protocol
|
||||||
template = self._set_template(template,
|
template = self._set_template(template,
|
||||||
@ -301,7 +301,7 @@ class LoadBalancerTest(HeatTestCase):
|
|||||||
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
||||||
self.lb_name,
|
self.lb_name,
|
||||||
expected)
|
expected)
|
||||||
self.assertEquals(rsrc.validate(), None)
|
self.assertEqual(rsrc.validate(), None)
|
||||||
|
|
||||||
def test_validate_health_monitor(self):
|
def test_validate_health_monitor(self):
|
||||||
#test connect success
|
#test connect success
|
||||||
@ -319,7 +319,7 @@ class LoadBalancerTest(HeatTestCase):
|
|||||||
self.lb_name,
|
self.lb_name,
|
||||||
expected)
|
expected)
|
||||||
|
|
||||||
self.assertEquals(rsrc.validate(), None)
|
self.assertEqual(rsrc.validate(), None)
|
||||||
|
|
||||||
#test connect failure
|
#test connect failure
|
||||||
#bodyRegex is only valid for type 'HTTP(S)'
|
#bodyRegex is only valid for type 'HTTP(S)'
|
||||||
@ -331,7 +331,7 @@ class LoadBalancerTest(HeatTestCase):
|
|||||||
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
||||||
self.lb_name,
|
self.lb_name,
|
||||||
expected)
|
expected)
|
||||||
self.assertEquals(rsrc.validate(),
|
self.assertEqual(rsrc.validate(),
|
||||||
{'Error': 'Unknown Property bodyRegex'})
|
{'Error': 'Unknown Property bodyRegex'})
|
||||||
|
|
||||||
#test http fields
|
#test http fields
|
||||||
@ -348,7 +348,7 @@ class LoadBalancerTest(HeatTestCase):
|
|||||||
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
||||||
self.lb_name,
|
self.lb_name,
|
||||||
expected)
|
expected)
|
||||||
self.assertEquals(rsrc.validate(), None)
|
self.assertEqual(rsrc.validate(), None)
|
||||||
|
|
||||||
def test_validate_ssl_termination(self):
|
def test_validate_ssl_termination(self):
|
||||||
ssl_termination = {
|
ssl_termination = {
|
||||||
@ -367,7 +367,7 @@ class LoadBalancerTest(HeatTestCase):
|
|||||||
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
||||||
self.lb_name,
|
self.lb_name,
|
||||||
expected)
|
expected)
|
||||||
self.assertEquals(rsrc.validate(),
|
self.assertEqual(rsrc.validate(),
|
||||||
{'Error':
|
{'Error':
|
||||||
'Property error : %s: Property securePort not '
|
'Property error : %s: Property securePort not '
|
||||||
'assigned' % rsrc.name})
|
'assigned' % rsrc.name})
|
||||||
@ -380,7 +380,7 @@ class LoadBalancerTest(HeatTestCase):
|
|||||||
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
|
||||||
self.lb_name,
|
self.lb_name,
|
||||||
expected)
|
expected)
|
||||||
self.assertEquals(rsrc.validate(), None)
|
self.assertEqual(rsrc.validate(), None)
|
||||||
|
|
||||||
def test_post_creation_access_list(self):
|
def test_post_creation_access_list(self):
|
||||||
access_list = [{"address": '192.168.1.1/0',
|
access_list = [{"address": '192.168.1.1/0',
|
||||||
|
@ -60,7 +60,7 @@ class ComponentsTest(HeatTestCase):
|
|||||||
|
|
||||||
schema['config_mysql'] = {}
|
schema['config_mysql'] = {}
|
||||||
comps = Components(schema)
|
comps = Components(schema)
|
||||||
self.assertEquals(1, len(comps))
|
self.assertEqual(1, len(comps))
|
||||||
comp = comps['config_mysql']
|
comp = comps['config_mysql']
|
||||||
self.assertIsInstance(comp, Component)
|
self.assertIsInstance(comp, Component)
|
||||||
|
|
||||||
|
@ -115,4 +115,4 @@ class DBInstanceTest(HeatTestCase):
|
|||||||
templ)
|
templ)
|
||||||
|
|
||||||
res = stack['DatabaseServer']
|
res = stack['DatabaseServer']
|
||||||
self.assertEquals(None, res._validate_against_facade(DBInstance))
|
self.assertEqual(None, res._validate_against_facade(DBInstance))
|
||||||
|
@ -46,11 +46,11 @@ class HOTemplateTest(HeatTestCase):
|
|||||||
self.fail('Expected KeyError for invalid section')
|
self.fail('Expected KeyError for invalid section')
|
||||||
|
|
||||||
# test defaults for valid sections
|
# test defaults for valid sections
|
||||||
self.assertEquals(tmpl[hot.VERSION], '2013-05-23')
|
self.assertEqual(tmpl[hot.VERSION], '2013-05-23')
|
||||||
self.assertEquals(tmpl[hot.DESCRIPTION], 'No description')
|
self.assertEqual(tmpl[hot.DESCRIPTION], 'No description')
|
||||||
self.assertEquals(tmpl[hot.PARAMETERS], {})
|
self.assertEqual(tmpl[hot.PARAMETERS], {})
|
||||||
self.assertEquals(tmpl[hot.RESOURCES], {})
|
self.assertEqual(tmpl[hot.RESOURCES], {})
|
||||||
self.assertEquals(tmpl[hot.OUTPUTS], {})
|
self.assertEqual(tmpl[hot.OUTPUTS], {})
|
||||||
|
|
||||||
def test_translate_parameters(self):
|
def test_translate_parameters(self):
|
||||||
"""Test translation of parameters into internal engine format."""
|
"""Test translation of parameters into internal engine format."""
|
||||||
|
@ -254,7 +254,7 @@ Resources:
|
|||||||
t = template_format.parse(root_template)
|
t = template_format.parse(root_template)
|
||||||
stack = self.parse_stack(t)
|
stack = self.parse_stack(t)
|
||||||
stack.create()
|
stack.create()
|
||||||
self.assertEquals((stack.CREATE, stack.FAILED), stack.state)
|
self.assertEqual((stack.CREATE, stack.FAILED), stack.state)
|
||||||
self.assertIn('Recursion depth exceeds', stack.status_reason)
|
self.assertIn('Recursion depth exceeds', stack.status_reason)
|
||||||
self.m.VerifyAll()
|
self.m.VerifyAll()
|
||||||
|
|
||||||
|
@ -1366,8 +1366,8 @@ class PropertiesValidationTest(testtools.TestCase):
|
|||||||
param_expected = {'foo': {'Type': 'Json'}}
|
param_expected = {'foo': {'Type': 'Json'}}
|
||||||
(parameters, props) = \
|
(parameters, props) = \
|
||||||
properties.Properties.schema_to_parameters_and_properties(schema)
|
properties.Properties.schema_to_parameters_and_properties(schema)
|
||||||
self.assertEquals(param_expected, parameters)
|
self.assertEqual(param_expected, parameters)
|
||||||
self.assertEquals(prop_expected, props)
|
self.assertEqual(prop_expected, props)
|
||||||
|
|
||||||
def test_schema_to_template_nested_map_list_map_schema(self):
|
def test_schema_to_template_nested_map_list_map_schema(self):
|
||||||
key_schema = {'bar': {'Type': 'Number'}}
|
key_schema = {'bar': {'Type': 'Number'}}
|
||||||
@ -1382,8 +1382,8 @@ class PropertiesValidationTest(testtools.TestCase):
|
|||||||
param_expected = {'foo': {'Type': 'CommaDelimitedList'}}
|
param_expected = {'foo': {'Type': 'CommaDelimitedList'}}
|
||||||
(parameters, props) = \
|
(parameters, props) = \
|
||||||
properties.Properties.schema_to_parameters_and_properties(schema)
|
properties.Properties.schema_to_parameters_and_properties(schema)
|
||||||
self.assertEquals(param_expected, parameters)
|
self.assertEqual(param_expected, parameters)
|
||||||
self.assertEquals(prop_expected, props)
|
self.assertEqual(prop_expected, props)
|
||||||
|
|
||||||
def test_schema_invalid_parameters_stripped(self):
|
def test_schema_invalid_parameters_stripped(self):
|
||||||
schema = {'foo': {'Type': 'String',
|
schema = {'foo': {'Type': 'String',
|
||||||
@ -1395,5 +1395,5 @@ class PropertiesValidationTest(testtools.TestCase):
|
|||||||
|
|
||||||
(parameters, props) = \
|
(parameters, props) = \
|
||||||
properties.Properties.schema_to_parameters_and_properties(schema)
|
properties.Properties.schema_to_parameters_and_properties(schema)
|
||||||
self.assertEquals(param_expected, parameters)
|
self.assertEqual(param_expected, parameters)
|
||||||
self.assertEquals(prop_expected, props)
|
self.assertEqual(prop_expected, props)
|
||||||
|
@ -142,7 +142,7 @@ class JsonYamlResolvedCompareTest(HeatTestCase):
|
|||||||
del(t2nr['Resources'])
|
del(t2nr['Resources'])
|
||||||
self.assertEqual(t1nr, t2nr)
|
self.assertEqual(t1nr, t2nr)
|
||||||
|
|
||||||
self.assertEquals(set(stack1.resources.keys()),
|
self.assertEqual(set(stack1.resources.keys()),
|
||||||
set(stack2.resources.keys()))
|
set(stack2.resources.keys()))
|
||||||
for key in stack1.resources:
|
for key in stack1.resources:
|
||||||
self.assertEqual(stack1.resources[key].t, stack2.resources[key].t)
|
self.assertEqual(stack1.resources[key].t, stack2.resources[key].t)
|
||||||
|
@ -671,7 +671,7 @@ Resources:
|
|||||||
resource='INVALID-REF-IN-TEMPLATE',
|
resource='INVALID-REF-IN-TEMPLATE',
|
||||||
key='the_nic.Properties.GroupSet[0]')
|
key='the_nic.Properties.GroupSet[0]')
|
||||||
|
|
||||||
self.assertEquals(str(expected_exception), str(real_exception))
|
self.assertEqual(str(expected_exception), str(real_exception))
|
||||||
|
|
||||||
def test_network_interface_error_no_ref(self):
|
def test_network_interface_error_no_ref(self):
|
||||||
self.mock_keystone()
|
self.mock_keystone()
|
||||||
|
@ -223,7 +223,7 @@ class ResourceTest(HeatTestCase):
|
|||||||
try:
|
try:
|
||||||
resource(request)
|
resource(request)
|
||||||
except exception.HTTPExceptionDisguise as e:
|
except exception.HTTPExceptionDisguise as e:
|
||||||
self.assertEquals(message_es, e.exc.message)
|
self.assertEqual(message_es, e.exc.message)
|
||||||
self.m.VerifyAll()
|
self.m.VerifyAll()
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user