openstack
/
nova
Code Issues Proposed changes

Merge "Fix race in _test_live_migration_force_complete"

This commit is contained in:
Zuul 2019-09-12 12:24:56 +00:00 committed by Gerrit Code Review
parent 5fa49cd0b8 a4bf6cd265
commit 7a18209a81
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nova/tests/functional/notification_sample_tests/test_instance.py
View File

@ -293,6 +293,17 @@ class TestInstanceNotificationSampleWithMultipleCompute(
migration_id = migrations[0]['id']
self.admin_api.force_complete_migration(server['id'], migration_id)
# Note that we wait for instance.live_migration_force_complete.end but
# by the time we check versioned notifications received we could have
# entered ComputeManager._post_live_migration which could emit up to
# four other notifications:
# - instance.live_migration_post.start
# - instance.live_migration_post_dest.start
# - instance.live_migration_post_dest.end
# - instance.live_migration_post.end
# We are not concerned about those in this test so that's why we stop
# once we get instance.live_migration_force_complete.end and assert
# we got at least 6 notifications.
self._wait_for_notification(
'instance.live_migration_force_complete.end')
@ -302,8 +313,8 @@ class TestInstanceNotificationSampleWithMultipleCompute(
# 3. instance.live_migration_pre.end
# 4. instance.live_migration_force_complete.start
# 5. instance.live_migration_force_complete.end
self.assertEqual(6, len(fake_notifier.VERSIONED_NOTIFICATIONS),
fake_notifier.VERSIONED_NOTIFICATIONS)
self.assertGreaterEqual(6, len(fake_notifier.VERSIONED_NOTIFICATIONS),
fake_notifier.VERSIONED_NOTIFICATIONS)
self._verify_notification(
'instance-live_migration_force_complete-start',
replacements={