Fix bizarre Swift DeletionPolicy unit tests
If something shouldn't be called... don't tell the mocks to expect it to be called. We will get UnexpectedMethodCallError if it is. Change-Id: I61a7b77cb273b42177a37efa98fc62fd69770545
This commit is contained in:
parent
560804e428
commit
a38a8e73dd
|
@ -208,9 +208,6 @@ class s3Test(HeatTestCase):
|
||||||
mox.Regex(self.container_pattern),
|
mox.Regex(self.container_pattern),
|
||||||
{'X-Container-Write': 'test_tenant:test_username',
|
{'X-Container-Write': 'test_tenant:test_username',
|
||||||
'X-Container-Read': 'test_tenant:test_username'}).AndReturn(None)
|
'X-Container-Read': 'test_tenant:test_username'}).AndReturn(None)
|
||||||
# This should not be called
|
|
||||||
swiftclient.Connection.delete_container(
|
|
||||||
mox.Regex(self.container_pattern)).AndReturn(None)
|
|
||||||
|
|
||||||
self.m.ReplayAll()
|
self.m.ReplayAll()
|
||||||
t = template_format.parse(swift_template)
|
t = template_format.parse(swift_template)
|
||||||
|
@ -219,13 +216,7 @@ class s3Test(HeatTestCase):
|
||||||
bucket['DeletionPolicy'] = 'Retain'
|
bucket['DeletionPolicy'] = 'Retain'
|
||||||
stack = parse_stack(t)
|
stack = parse_stack(t)
|
||||||
rsrc = self.create_resource(t, stack, 'S3Bucket')
|
rsrc = self.create_resource(t, stack, 'S3Bucket')
|
||||||
# if delete_container is called, mox verify will succeed
|
|
||||||
rsrc.delete()
|
rsrc.delete()
|
||||||
self.assertEqual(rsrc.DELETE_COMPLETE, rsrc.state)
|
self.assertEqual(rsrc.DELETE_COMPLETE, rsrc.state)
|
||||||
|
|
||||||
try:
|
self.m.VerifyAll()
|
||||||
self.m.VerifyAll()
|
|
||||||
except mox.ExpectedMethodCallsError:
|
|
||||||
return
|
|
||||||
|
|
||||||
raise Exception('delete_container was called despite Retain policy')
|
|
||||||
|
|
|
@ -235,9 +235,6 @@ class swiftTest(HeatTestCase):
|
||||||
mox.Regex(self.container_pattern),
|
mox.Regex(self.container_pattern),
|
||||||
{'X-Container-Write': None,
|
{'X-Container-Write': None,
|
||||||
'X-Container-Read': None}).AndReturn(None)
|
'X-Container-Read': None}).AndReturn(None)
|
||||||
# This should not be called
|
|
||||||
swiftclient.Connection.delete_container(
|
|
||||||
mox.Regex(self.container_pattern)).AndReturn(None)
|
|
||||||
|
|
||||||
self.m.ReplayAll()
|
self.m.ReplayAll()
|
||||||
t = template_format.parse(swift_template)
|
t = template_format.parse(swift_template)
|
||||||
|
@ -246,13 +243,7 @@ class swiftTest(HeatTestCase):
|
||||||
container['DeletionPolicy'] = 'Retain'
|
container['DeletionPolicy'] = 'Retain'
|
||||||
stack = parse_stack(t)
|
stack = parse_stack(t)
|
||||||
rsrc = self.create_resource(t, stack, 'SwiftContainer')
|
rsrc = self.create_resource(t, stack, 'SwiftContainer')
|
||||||
# if delete_container is called, mox verify will succeed
|
|
||||||
rsrc.delete()
|
rsrc.delete()
|
||||||
self.assertEqual(rsrc.DELETE_COMPLETE, rsrc.state)
|
self.assertEqual(rsrc.DELETE_COMPLETE, rsrc.state)
|
||||||
|
|
||||||
try:
|
self.m.VerifyAll()
|
||||||
self.m.VerifyAll()
|
|
||||||
except mox.ExpectedMethodCallsError:
|
|
||||||
return
|
|
||||||
|
|
||||||
raise Exception('delete_container was called despite Retain policy')
|
|
||||||
|
|
Loading…
Reference in New Issue