openstack/cinder
Code Issues Proposed changes

Merge "Make test_create_delete_snapshot more robust"

Browse Source
This commit is contained in:
Jenkins 2015-01-19 21:01:10 +00:00 committed by Gerrit Code Review
commit 09b1ff2091
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cinder/tests/test_volume.py
View File

@ -1760,13 +1760,24 @@ class VolumeTestCase(BaseVolumeTestCase):
**self.volume_params) **self.volume_params)
self.assertEqual(len(fake_notifier.NOTIFICATIONS), 0) self.assertEqual(len(fake_notifier.NOTIFICATIONS), 0)
self.volume.create_volume(self.context, volume['id']) self.volume.create_volume(self.context, volume['id'])
msg = fake_notifier.NOTIFICATIONS[0]
self.assertEqual(msg['event_type'], 'volume.create.start')
self.assertEqual(msg['payload']['status'], 'creating')
self.assertEqual(msg['priority'], 'INFO')
msg = fake_notifier.NOTIFICATIONS[1]
self.assertEqual(msg['event_type'], 'volume.create.end')
self.assertEqual(msg['payload']['status'], 'available')
self.assertEqual(msg['priority'], 'INFO')
if len(fake_notifier.NOTIFICATIONS) > 2:
# Cause an assert to print the unexpected item
self.assertFalse(fake_notifier.NOTIFICATIONS[2])
self.assertEqual(len(fake_notifier.NOTIFICATIONS), 2) self.assertEqual(len(fake_notifier.NOTIFICATIONS), 2)
snapshot_id = self._create_snapshot(volume['id'])['id'] snapshot_id = self._create_snapshot(volume['id'])['id']
self.volume.create_snapshot(self.context, volume['id'], snapshot_id) self.volume.create_snapshot(self.context, volume['id'], snapshot_id)
self.assertEqual(snapshot_id, self.assertEqual(snapshot_id,
db.snapshot_get(context.get_admin_context(), db.snapshot_get(context.get_admin_context(),
snapshot_id).id) snapshot_id).id)
self.assertEqual(len(fake_notifier.NOTIFICATIONS), 4)
msg = fake_notifier.NOTIFICATIONS[2] msg = fake_notifier.NOTIFICATIONS[2]
self.assertEqual(msg['event_type'], 'snapshot.create.start') self.assertEqual(msg['event_type'], 'snapshot.create.start')
expected = { expected = {
@ -1787,8 +1798,13 @@ class VolumeTestCase(BaseVolumeTestCase):
expected['status'] = 'available' expected['status'] = 'available'
self.assertDictMatch(msg['payload'], expected) self.assertDictMatch(msg['payload'], expected)
if len(fake_notifier.NOTIFICATIONS) > 4:
# Cause an assert to print the unexpected item
self.assertFalse(fake_notifier.NOTIFICATIONS[4])
self.assertEqual(len(fake_notifier.NOTIFICATIONS), 4)
self.volume.delete_snapshot(self.context, snapshot_id) self.volume.delete_snapshot(self.context, snapshot_id)
self.assertEqual(len(fake_notifier.NOTIFICATIONS), 6)
msg = fake_notifier.NOTIFICATIONS[4] msg = fake_notifier.NOTIFICATIONS[4]
self.assertEqual(msg['event_type'], 'snapshot.delete.start') self.assertEqual(msg['event_type'], 'snapshot.delete.start')
expected['status'] = 'available' expected['status'] = 'available'
@ -1797,6 +1813,12 @@ class VolumeTestCase(BaseVolumeTestCase):
self.assertEqual(msg['event_type'], 'snapshot.delete.end') self.assertEqual(msg['event_type'], 'snapshot.delete.end')
self.assertDictMatch(msg['payload'], expected) self.assertDictMatch(msg['payload'], expected)
if len(fake_notifier.NOTIFICATIONS) > 6:
# Cause an assert to print the unexpected item
self.assertFalse(fake_notifier.NOTIFICATIONS[6])
self.assertEqual(len(fake_notifier.NOTIFICATIONS), 6)
snap = db.snapshot_get(context.get_admin_context(read_deleted='yes'), snap = db.snapshot_get(context.get_admin_context(read_deleted='yes'),
snapshot_id) snapshot_id)
self.assertEqual(snap['status'], 'deleted') self.assertEqual(snap['status'], 'deleted')