womax/nova
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix race in test_volume_swap_server_with_error"

Browse Source
This commit is contained in:
Jenkins
2016-12-12 06:51:43 +00:00
committed by Gerrit Code Review
parent 760700321e 2e32ed122b
commit d22ef5bc58
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nova/tests/functional/notification_sample_tests/test_instance.py
+9 -2
View File
@@ -578,13 +578,20 @@ class TestInstanceNotificationSample(
self.cinder.SWAP_ERR_NEW_VOL)
self._wait_until_swap_volume_error()
# Five versioned notifications are generated.
# Five versioned notifications are generated. We only rely on the
# first four because _wait_until_swap_volume_error will return True
# after volume_api.unreserve is called on the cinder fixture, and that
# happens before the instance fault is handled in the compute manager
# which generates the 5th notification (compute.exception).
# 0. instance-create-start
# 1. instance-create-start
# 2. instance-volume_swap-start
# 3. instance-volume_swap-error
# 4. compute.exception
self.assertEqual(5, len(fake_notifier.VERSIONED_NOTIFICATIONS))
self.assertTrue(len(fake_notifier.VERSIONED_NOTIFICATIONS) >= 4,
'Unexpected number of versioned notifications. '
'Expected at least 4, got: %s' %
len(fake_notifier.VERSIONED_NOTIFICATIONS))
self._verify_notification(
'instance-volume_swap-start',
replacements={