diff --git a/heat/tests/test_cloud_loadbalancer.py b/heat/tests/test_cloud_loadbalancer.py index dbe2cdffe0..6eb4026798 100644 --- a/heat/tests/test_cloud_loadbalancer.py +++ b/heat/tests/test_cloud_loadbalancer.py @@ -280,7 +280,7 @@ class LoadBalancerTest(HeatTestCase): rsrc, fake_loadbalancer = self._mock_loadbalancer(template, self.lb_name, expected) - self.assertEquals(rsrc.validate(), { + self.assertEqual(rsrc.validate(), { 'Error': 'The halfClosed property is only available for the ' 'TCP or TCP_CLIENT_FIRST protocols'}) @@ -291,7 +291,7 @@ class LoadBalancerTest(HeatTestCase): rsrc, fake_loadbalancer = self._mock_loadbalancer(template, self.lb_name, expected) - self.assertEquals(rsrc.validate(), None) + self.assertEqual(rsrc.validate(), None) #test TCP_CLIENT_FIRST protocol template = self._set_template(template, @@ -301,7 +301,7 @@ class LoadBalancerTest(HeatTestCase): rsrc, fake_loadbalancer = self._mock_loadbalancer(template, self.lb_name, expected) - self.assertEquals(rsrc.validate(), None) + self.assertEqual(rsrc.validate(), None) def test_validate_health_monitor(self): #test connect success @@ -319,7 +319,7 @@ class LoadBalancerTest(HeatTestCase): self.lb_name, expected) - self.assertEquals(rsrc.validate(), None) + self.assertEqual(rsrc.validate(), None) #test connect failure #bodyRegex is only valid for type 'HTTP(S)' @@ -331,8 +331,8 @@ class LoadBalancerTest(HeatTestCase): rsrc, fake_loadbalancer = self._mock_loadbalancer(template, self.lb_name, expected) - self.assertEquals(rsrc.validate(), - {'Error': 'Unknown Property bodyRegex'}) + self.assertEqual(rsrc.validate(), + {'Error': 'Unknown Property bodyRegex'}) #test http fields health_monitor['type'] = 'HTTP' @@ -348,7 +348,7 @@ class LoadBalancerTest(HeatTestCase): rsrc, fake_loadbalancer = self._mock_loadbalancer(template, self.lb_name, expected) - self.assertEquals(rsrc.validate(), None) + self.assertEqual(rsrc.validate(), None) def test_validate_ssl_termination(self): ssl_termination = { @@ -367,10 +367,10 @@ class LoadBalancerTest(HeatTestCase): rsrc, fake_loadbalancer = self._mock_loadbalancer(template, self.lb_name, expected) - self.assertEquals(rsrc.validate(), - {'Error': - 'Property error : %s: Property securePort not ' - 'assigned' % rsrc.name}) + self.assertEqual(rsrc.validate(), + {'Error': + 'Property error : %s: Property securePort not ' + 'assigned' % rsrc.name}) ssl_termination['securePort'] = 443 template = self._set_template(template, @@ -380,7 +380,7 @@ class LoadBalancerTest(HeatTestCase): rsrc, fake_loadbalancer = self._mock_loadbalancer(template, self.lb_name, expected) - self.assertEquals(rsrc.validate(), None) + self.assertEqual(rsrc.validate(), None) def test_post_creation_access_list(self): access_list = [{"address": '192.168.1.1/0', diff --git a/heat/tests/test_components.py b/heat/tests/test_components.py index 0c89848368..df25b7352e 100644 --- a/heat/tests/test_components.py +++ b/heat/tests/test_components.py @@ -60,7 +60,7 @@ class ComponentsTest(HeatTestCase): schema['config_mysql'] = {} comps = Components(schema) - self.assertEquals(1, len(comps)) + self.assertEqual(1, len(comps)) comp = comps['config_mysql'] self.assertIsInstance(comp, Component) diff --git a/heat/tests/test_dbinstance.py b/heat/tests/test_dbinstance.py index 2eaa60f80a..04ea075f10 100644 --- a/heat/tests/test_dbinstance.py +++ b/heat/tests/test_dbinstance.py @@ -115,4 +115,4 @@ class DBInstanceTest(HeatTestCase): templ) res = stack['DatabaseServer'] - self.assertEquals(None, res._validate_against_facade(DBInstance)) + self.assertEqual(None, res._validate_against_facade(DBInstance)) diff --git a/heat/tests/test_hot.py b/heat/tests/test_hot.py index 8beaaf3ec1..7111226eed 100644 --- a/heat/tests/test_hot.py +++ b/heat/tests/test_hot.py @@ -46,11 +46,11 @@ class HOTemplateTest(HeatTestCase): self.fail('Expected KeyError for invalid section') # test defaults for valid sections - self.assertEquals(tmpl[hot.VERSION], '2013-05-23') - self.assertEquals(tmpl[hot.DESCRIPTION], 'No description') - self.assertEquals(tmpl[hot.PARAMETERS], {}) - self.assertEquals(tmpl[hot.RESOURCES], {}) - self.assertEquals(tmpl[hot.OUTPUTS], {}) + self.assertEqual(tmpl[hot.VERSION], '2013-05-23') + self.assertEqual(tmpl[hot.DESCRIPTION], 'No description') + self.assertEqual(tmpl[hot.PARAMETERS], {}) + self.assertEqual(tmpl[hot.RESOURCES], {}) + self.assertEqual(tmpl[hot.OUTPUTS], {}) def test_translate_parameters(self): """Test translation of parameters into internal engine format.""" diff --git a/heat/tests/test_nested_stack.py b/heat/tests/test_nested_stack.py index cd8b13bb7f..e7434800fa 100644 --- a/heat/tests/test_nested_stack.py +++ b/heat/tests/test_nested_stack.py @@ -254,7 +254,7 @@ Resources: t = template_format.parse(root_template) stack = self.parse_stack(t) 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.m.VerifyAll() diff --git a/heat/tests/test_properties.py b/heat/tests/test_properties.py index faab2dbc77..d98a031323 100644 --- a/heat/tests/test_properties.py +++ b/heat/tests/test_properties.py @@ -1366,8 +1366,8 @@ class PropertiesValidationTest(testtools.TestCase): param_expected = {'foo': {'Type': 'Json'}} (parameters, props) = \ properties.Properties.schema_to_parameters_and_properties(schema) - self.assertEquals(param_expected, parameters) - self.assertEquals(prop_expected, props) + self.assertEqual(param_expected, parameters) + self.assertEqual(prop_expected, props) def test_schema_to_template_nested_map_list_map_schema(self): key_schema = {'bar': {'Type': 'Number'}} @@ -1382,8 +1382,8 @@ class PropertiesValidationTest(testtools.TestCase): param_expected = {'foo': {'Type': 'CommaDelimitedList'}} (parameters, props) = \ properties.Properties.schema_to_parameters_and_properties(schema) - self.assertEquals(param_expected, parameters) - self.assertEquals(prop_expected, props) + self.assertEqual(param_expected, parameters) + self.assertEqual(prop_expected, props) def test_schema_invalid_parameters_stripped(self): schema = {'foo': {'Type': 'String', @@ -1395,5 +1395,5 @@ class PropertiesValidationTest(testtools.TestCase): (parameters, props) = \ properties.Properties.schema_to_parameters_and_properties(schema) - self.assertEquals(param_expected, parameters) - self.assertEquals(prop_expected, props) + self.assertEqual(param_expected, parameters) + self.assertEqual(prop_expected, props) diff --git a/heat/tests/test_template_format.py b/heat/tests/test_template_format.py index 20a464861d..2f82826ab8 100644 --- a/heat/tests/test_template_format.py +++ b/heat/tests/test_template_format.py @@ -142,8 +142,8 @@ class JsonYamlResolvedCompareTest(HeatTestCase): del(t2nr['Resources']) self.assertEqual(t1nr, t2nr) - self.assertEquals(set(stack1.resources.keys()), - set(stack2.resources.keys())) + self.assertEqual(set(stack1.resources.keys()), + set(stack2.resources.keys())) for key in stack1.resources: self.assertEqual(stack1.resources[key].t, stack2.resources[key].t) diff --git a/heat/tests/test_vpc.py b/heat/tests/test_vpc.py index f719793514..4331cca183 100644 --- a/heat/tests/test_vpc.py +++ b/heat/tests/test_vpc.py @@ -671,7 +671,7 @@ Resources: resource='INVALID-REF-IN-TEMPLATE', 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): self.mock_keystone() diff --git a/heat/tests/test_wsgi.py b/heat/tests/test_wsgi.py index 52783d9826..843d88f0e3 100644 --- a/heat/tests/test_wsgi.py +++ b/heat/tests/test_wsgi.py @@ -223,7 +223,7 @@ class ResourceTest(HeatTestCase): try: resource(request) except exception.HTTPExceptionDisguise as e: - self.assertEquals(message_es, e.exc.message) + self.assertEqual(message_es, e.exc.message) self.m.VerifyAll()