From 6e3505e33b40fa72715dbe7c200b76b8e4d5b7c2 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Tue, 18 Sep 2012 14:31:57 +1200 Subject: [PATCH] Trivial unit test changes - rename assertEquals to assertEqual - fix the swiftclient package import, which was broken for testing Change-Id: Icbe80ded918b9b2d089797645bf8d46a9efaf619 --- heat/tests/test_eip.py | 14 +++++++------- heat/tests/test_s3.py | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/heat/tests/test_eip.py b/heat/tests/test_eip.py index b226011c..abb19e09 100644 --- a/heat/tests/test_eip.py +++ b/heat/tests/test_eip.py @@ -66,7 +66,7 @@ class EIPTest(unittest.TestCase): resource = eip.ElasticIp(resource_name, t['Resources'][resource_name], stack) - self.assertEquals(None, resource.validate()) + self.assertEqual(None, resource.validate()) self.assertEqual(None, resource.create()) self.assertEqual(eip.ElasticIp.CREATE_COMPLETE, resource.state) return resource @@ -75,7 +75,7 @@ class EIPTest(unittest.TestCase): resource = eip.ElasticIpAssociation(resource_name, t['Resources'][resource_name], stack) - self.assertEquals(None, resource.validate()) + self.assertEqual(None, resource.validate()) self.assertEqual(None, resource.create()) self.assertEqual(eip.ElasticIpAssociation.CREATE_COMPLETE, resource.state) @@ -92,13 +92,13 @@ class EIPTest(unittest.TestCase): stack = self.parse_stack(t) resource = self.create_eip(t, stack, 'IPAddress') - self.assertEquals('11.0.0.1', resource.FnGetRefId()) + self.assertEqual('11.0.0.1', resource.FnGetRefId()) resource.ipaddress = None - self.assertEquals('11.0.0.1', resource.FnGetRefId()) + self.assertEqual('11.0.0.1', resource.FnGetRefId()) - self.assertEquals('1', resource.FnGetAtt('AllocationId')) + self.assertEqual('1', resource.FnGetAtt('AllocationId')) - self.assertEquals(eip.ElasticIp.UPDATE_REPLACE, + self.assertEqual(eip.ElasticIp.UPDATE_REPLACE, resource.handle_update()) try: @@ -128,7 +128,7 @@ class EIPTest(unittest.TestCase): association = self.create_association(t, stack, 'IPAssoc') # TODO sbaker, figure out why this is an empty string - #self.assertEquals('', association.FnGetRefId()) + #self.assertEqual('', association.FnGetRefId()) association.delete() resource.delete() diff --git a/heat/tests/test_s3.py b/heat/tests/test_s3.py index 86ab3e4e..552b8742 100644 --- a/heat/tests/test_s3.py +++ b/heat/tests/test_s3.py @@ -29,7 +29,7 @@ from heat.engine import parser from utils import skip_if try: - from swiftclients import client as swiftclient + from swiftclient import client as swiftclient except: skip_test = True else: @@ -106,10 +106,10 @@ class s3Test(unittest.TestCase): self.assertTrue(re.match(self.container_pattern, ref_id)) - self.assertEquals('localhost', resource.FnGetAtt('DomainName')) + self.assertEqual('localhost', resource.FnGetAtt('DomainName')) url = 'http://localhost:8080/v_2/%s' % ref_id - self.assertEquals(url, resource.FnGetAtt('WebsiteURL')) + self.assertEqual(url, resource.FnGetAtt('WebsiteURL')) try: resource.FnGetAtt('Foo') @@ -117,7 +117,7 @@ class s3Test(unittest.TestCase): except s3.exception.InvalidTemplateAttribute: pass - self.assertEquals(s3.S3Bucket.UPDATE_REPLACE, resource.handle_update()) + self.assertEqual(s3.S3Bucket.UPDATE_REPLACE, resource.handle_update()) resource.delete() self.m.VerifyAll() -- 2.45.2