Merge "Stabilize unshelve notification sample tests"

Author: Zuul

nova/tests/functional/notification_sample_tests/test_instance.py

@@ -816,6 +816,7 @@ def _test_shelve_and_shelve_offload_server(self, server):
 
         self.api.post_server_action(server['id'], {'unshelve': None})
         self._wait_for_state_change(self.api, server, 'ACTIVE')
+        self._wait_for_notification('instance.unshelve.end')
 
     def _test_unshelve_server(self, server):
         # setting the shelved_offload_time to 0 should set the
@@ -833,6 +834,7 @@ def _test_unshelve_server(self, server):
         post = {'unshelve': None}
         self.api.post_server_action(server['id'], post)
         self._wait_for_state_change(self.admin_api, server, 'ACTIVE')
+        self._wait_for_notification('instance.unshelve.end')
         self.assertEqual(9, len(fake_notifier.VERSIONED_NOTIFICATIONS))
         self._verify_notification(
             'instance-unshelve-start',