From c0a95188a181df75608949729e27e679b83a5272 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Mon, 10 Dec 2012 17:03:14 +0100 Subject: [PATCH] Make Volume tests independent Previously, the VolumeAttachment tests relied on stuff left in the database by the Volume tests. Change-Id: I8ff63cb6dac0968e63a83fb5c2f78e2a9024dd7c Signed-off-by: Zane Bitter --- heat/tests/test_volume.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/heat/tests/test_volume.py b/heat/tests/test_volume.py index fbc4ce84..af38d738 100644 --- a/heat/tests/test_volume.py +++ b/heat/tests/test_volume.py @@ -66,7 +66,7 @@ class VolumeTest(unittest.TestCase): 'auth_url': 'http://localhost:5000/v2.0'}) template = parser.Template(t) params = parser.Parameters(stack_name, template, {'KeyName': 'test'}) - stack = parser.Stack(ctx, stack_name, template, params, stack_id=-1) + stack = parser.Stack(ctx, stack_name, template, params) return stack @@ -147,9 +147,16 @@ class VolumeTest(unittest.TestCase): self.m.VerifyAll() def test_volume_attachment_error(self): + fv = FakeVolume('creating', 'available') fva = FakeVolume('attaching', 'error') stack_name = 'test_volume_attach_error_stack' + # volume create + vol.Volume.nova('volume').MultipleTimes().AndReturn(self.fc) + self.fc.volumes.create(u'1', + display_description='%s.DataVolume' % stack_name, + display_name='%s.DataVolume' % stack_name).AndReturn(fv) + # create script vol.VolumeAttachment.nova().MultipleTimes().AndReturn(self.fc) vol.VolumeAttachment.nova('volume').MultipleTimes().AndReturn(self.fc) @@ -165,6 +172,8 @@ class VolumeTest(unittest.TestCase): t = self.load_template() stack = self.parse_stack(t, stack_name) + self.assertEqual(stack['DataVolume'].create(), None) + self.assertEqual(fv.status, 'available') resource = vol.VolumeAttachment('MountPoint', t['Resources']['MountPoint'], stack) @@ -173,9 +182,16 @@ class VolumeTest(unittest.TestCase): self.m.VerifyAll() def test_volume_attachment(self): + fv = FakeVolume('creating', 'available') fva = FakeVolume('attaching', 'in-use') stack_name = 'test_volume_attach_stack' + # volume create + vol.Volume.nova('volume').MultipleTimes().AndReturn(self.fc) + self.fc.volumes.create(u'1', + display_description='%s.DataVolume' % stack_name, + display_name='%s.DataVolume' % stack_name).AndReturn(fv) + # create script vol.VolumeAttachment.nova().MultipleTimes().AndReturn(self.fc) vol.VolumeAttachment.nova('volume').MultipleTimes().AndReturn(self.fc) @@ -197,6 +213,8 @@ class VolumeTest(unittest.TestCase): t = self.load_template() stack = self.parse_stack(t, stack_name) + self.assertEqual(stack['DataVolume'].create(), None) + self.assertEqual(fv.status, 'available') resource = self.create_attachment(t, stack, 'MountPoint') self.assertEqual(resource.handle_update(), vol.Volume.UPDATE_REPLACE) -- 2.45.2