From afbd6c9d999b79f9641ab886e284e720128f1dfb Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Mon, 17 Jun 2013 12:24:50 +0200 Subject: [PATCH] Use PhysName for testing Swift container names Change-Id: Icc000a9235fcd9ee810581b932ded73319decfee --- heat/tests/test_s3.py | 49 ++++++++++++++++++---------------------- heat/tests/test_swift.py | 43 ++++++++++++++++------------------- 2 files changed, 41 insertions(+), 51 deletions(-) diff --git a/heat/tests/test_s3.py b/heat/tests/test_s3.py index 3717d495..fbbe38db 100644 --- a/heat/tests/test_s3.py +++ b/heat/tests/test_s3.py @@ -13,10 +13,6 @@ # under the License. -import re - -import mox - from testtools import skipIf from heat.common import template_format @@ -25,6 +21,7 @@ from heat.engine.resources import s3 from heat.engine import resource from heat.engine import scheduler from heat.tests.common import HeatTestCase +from heat.tests import utils from heat.tests.utils import setup_dummy_db from heat.tests.utils import parse_stack @@ -66,7 +63,6 @@ class s3Test(HeatTestCase): self.m.StubOutWithMock(swiftclient.Connection, 'delete_container') self.m.StubOutWithMock(swiftclient.Connection, 'get_auth') - self.container_pattern = 'test_stack-test_resource-[0-9a-z]+' setup_dummy_db() def create_resource(self, t, stack, resource_name): @@ -78,15 +74,15 @@ class s3Test(HeatTestCase): return rsrc def test_attributes(self): + container_name = utils.PhysName('test_stack', 'test_resource') swiftclient.Connection.put_container( - mox.Regex(self.container_pattern), + container_name, {'X-Container-Write': 'test_tenant:test_username', 'X-Container-Read': 'test_tenant:test_username'} ).AndReturn(None) swiftclient.Connection.get_auth().MultipleTimes().AndReturn( ('http://localhost:8080/v_2', None)) - swiftclient.Connection.delete_container( - mox.Regex(self.container_pattern)).AndReturn(None) + swiftclient.Connection.delete_container(container_name).AndReturn(None) self.m.ReplayAll() t = template_format.parse(swift_template) @@ -94,8 +90,7 @@ class s3Test(HeatTestCase): rsrc = self.create_resource(t, stack, 'S3Bucket') ref_id = rsrc.FnGetRefId() - self.assertTrue(re.match(self.container_pattern, - ref_id)) + self.assertEqual(container_name, ref_id) self.assertEqual('localhost', rsrc.FnGetAtt('DomainName')) url = 'http://localhost:8080/v_2/%s' % ref_id @@ -115,12 +110,13 @@ class s3Test(HeatTestCase): self.m.VerifyAll() def test_public_read(self): + container_name = utils.PhysName('test_stack', 'test_resource') swiftclient.Connection.put_container( - mox.Regex(self.container_pattern), + utils.PhysName('test_stack', 'test_resource'), {'X-Container-Write': 'test_tenant:test_username', 'X-Container-Read': '.r:*'}).AndReturn(None) swiftclient.Connection.delete_container( - mox.Regex(self.container_pattern)).AndReturn(None) + container_name).AndReturn(None) self.m.ReplayAll() t = template_format.parse(swift_template) @@ -132,12 +128,13 @@ class s3Test(HeatTestCase): self.m.VerifyAll() def test_public_read_write(self): + container_name = utils.PhysName('test_stack', 'test_resource') swiftclient.Connection.put_container( - mox.Regex(self.container_pattern), + container_name, {'X-Container-Write': '.r:*', 'X-Container-Read': '.r:*'}).AndReturn(None) swiftclient.Connection.delete_container( - mox.Regex(self.container_pattern)).AndReturn(None) + container_name).AndReturn(None) self.m.ReplayAll() t = template_format.parse(swift_template) @@ -149,12 +146,12 @@ class s3Test(HeatTestCase): self.m.VerifyAll() def test_authenticated_read(self): + container_name = utils.PhysName('test_stack', 'test_resource') swiftclient.Connection.put_container( - mox.Regex(self.container_pattern), + container_name, {'X-Container-Write': 'test_tenant:test_username', 'X-Container-Read': 'test_tenant'}).AndReturn(None) - swiftclient.Connection.delete_container( - mox.Regex(self.container_pattern)).AndReturn(None) + swiftclient.Connection.delete_container(container_name).AndReturn(None) self.m.ReplayAll() t = template_format.parse(swift_template) @@ -166,15 +163,14 @@ class s3Test(HeatTestCase): self.m.VerifyAll() def test_website(self): - + container_name = utils.PhysName('test_stack', 'test_resource') swiftclient.Connection.put_container( - mox.Regex(self.container_pattern), + container_name, {'X-Container-Meta-Web-Error': 'error.html', 'X-Container-Meta-Web-Index': 'index.html', 'X-Container-Write': 'test_tenant:test_username', 'X-Container-Read': '.r:*'}).AndReturn(None) - swiftclient.Connection.delete_container( - mox.Regex(self.container_pattern)).AndReturn(None) + swiftclient.Connection.delete_container(container_name).AndReturn(None) self.m.ReplayAll() t = template_format.parse(swift_template) @@ -184,14 +180,13 @@ class s3Test(HeatTestCase): self.m.VerifyAll() def test_delete_exception(self): - + container_name = utils.PhysName('test_stack', 'test_resource') swiftclient.Connection.put_container( - mox.Regex(self.container_pattern), + container_name, {'X-Container-Write': 'test_tenant:test_username', 'X-Container-Read': 'test_tenant:test_username'}).AndReturn(None) - swiftclient.Connection.delete_container( - mox.Regex(self.container_pattern)).AndRaise( - swiftclient.ClientException('Test delete failure')) + swiftclient.Connection.delete_container(container_name).AndRaise( + swiftclient.ClientException('Test delete failure')) self.m.ReplayAll() t = template_format.parse(swift_template) @@ -205,7 +200,7 @@ class s3Test(HeatTestCase): # first run, with retain policy swiftclient.Connection.put_container( - mox.Regex(self.container_pattern), + utils.PhysName('test_stack', 'test_resource'), {'X-Container-Write': 'test_tenant:test_username', 'X-Container-Read': 'test_tenant:test_username'}).AndReturn(None) diff --git a/heat/tests/test_swift.py b/heat/tests/test_swift.py index efb1c842..58ab2a61 100644 --- a/heat/tests/test_swift.py +++ b/heat/tests/test_swift.py @@ -13,8 +13,6 @@ # under the License. -import re - import mox from testtools import skipIf @@ -25,6 +23,7 @@ from heat.engine.resources import swift from heat.engine import resource from heat.engine import scheduler from heat.tests.common import HeatTestCase +from heat.tests import utils from heat.tests.utils import setup_dummy_db from heat.tests.utils import parse_stack @@ -66,7 +65,6 @@ class swiftTest(HeatTestCase): self.m.StubOutWithMock(swiftclient.Connection, 'head_container') self.m.StubOutWithMock(swiftclient.Connection, 'get_auth') - self.container_pattern = 'test_stack-test_resource-[0-9a-z]+' setup_dummy_db() def create_resource(self, t, stack, resource_name): @@ -116,8 +114,9 @@ class swiftTest(HeatTestCase): "x-container-bytes-used": "17680980", "content-type": "text/plain; charset=utf-8"} + container_name = utils.PhysName('test_stack', 'test_resource') swiftclient.Connection.put_container( - mox.Regex(self.container_pattern), + container_name, {'X-Container-Write': None, 'X-Container-Read': None} ).AndReturn(None) @@ -125,8 +124,7 @@ class swiftTest(HeatTestCase): ('http://localhost:8080/v_2', None)) swiftclient.Connection.head_container( mox.IgnoreArg()).MultipleTimes().AndReturn(headers) - swiftclient.Connection.delete_container( - mox.Regex(self.container_pattern)).AndReturn(None) + swiftclient.Connection.delete_container(container_name).AndReturn(None) self.m.ReplayAll() t = template_format.parse(swift_template) @@ -134,8 +132,7 @@ class swiftTest(HeatTestCase): rsrc = self.create_resource(t, stack, 'SwiftContainer') ref_id = rsrc.FnGetRefId() - self.assertTrue(re.match(self.container_pattern, - ref_id)) + self.assertEqual(container_name, ref_id) self.assertEqual('localhost', rsrc.FnGetAtt('DomainName')) url = 'http://localhost:8080/v_2/%s' % ref_id @@ -158,12 +155,12 @@ class swiftTest(HeatTestCase): self.m.VerifyAll() def test_public_read(self): + container_name = utils.PhysName('test_stack', 'test_resource') swiftclient.Connection.put_container( - mox.Regex(self.container_pattern), + container_name, {'X-Container-Write': None, 'X-Container-Read': '.r:*'}).AndReturn(None) - swiftclient.Connection.delete_container( - mox.Regex(self.container_pattern)).AndReturn(None) + swiftclient.Connection.delete_container(container_name).AndReturn(None) self.m.ReplayAll() t = template_format.parse(swift_template) @@ -175,12 +172,12 @@ class swiftTest(HeatTestCase): self.m.VerifyAll() def test_public_read_write(self): + container_name = utils.PhysName('test_stack', 'test_resource') swiftclient.Connection.put_container( - mox.Regex(self.container_pattern), + container_name, {'X-Container-Write': '.r:*', 'X-Container-Read': '.r:*'}).AndReturn(None) - swiftclient.Connection.delete_container( - mox.Regex(self.container_pattern)).AndReturn(None) + swiftclient.Connection.delete_container(container_name).AndReturn(None) self.m.ReplayAll() t = template_format.parse(swift_template) @@ -193,15 +190,14 @@ class swiftTest(HeatTestCase): self.m.VerifyAll() def test_website(self): - + container_name = utils.PhysName('test_stack', 'test_resource') swiftclient.Connection.put_container( - mox.Regex(self.container_pattern), + container_name, {'X-Container-Meta-Web-Error': 'error.html', 'X-Container-Meta-Web-Index': 'index.html', 'X-Container-Write': None, 'X-Container-Read': '.r:*'}).AndReturn(None) - swiftclient.Connection.delete_container( - mox.Regex(self.container_pattern)).AndReturn(None) + swiftclient.Connection.delete_container(container_name).AndReturn(None) self.m.ReplayAll() t = template_format.parse(swift_template) @@ -211,14 +207,13 @@ class swiftTest(HeatTestCase): self.m.VerifyAll() def test_delete_exception(self): - + container_name = utils.PhysName('test_stack', 'test_resource') swiftclient.Connection.put_container( - mox.Regex(self.container_pattern), + container_name, {'X-Container-Write': None, 'X-Container-Read': None}).AndReturn(None) - swiftclient.Connection.delete_container( - mox.Regex(self.container_pattern)).AndRaise( - swiftclient.ClientException('Test delete failure')) + swiftclient.Connection.delete_container(container_name).AndRaise( + swiftclient.ClientException('Test delete failure')) self.m.ReplayAll() t = template_format.parse(swift_template) @@ -232,7 +227,7 @@ class swiftTest(HeatTestCase): # first run, with retain policy swiftclient.Connection.put_container( - mox.Regex(self.container_pattern), + utils.PhysName('test_stack', 'test_resource'), {'X-Container-Write': None, 'X-Container-Read': None}).AndReturn(None) -- 2.45.2