From 05bf0a93d845989acd37f3185df98b935916540d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9la=20Vancsics?= Date: Mon, 3 Jul 2017 10:59:53 +0200 Subject: [PATCH] Reduce (notification) test duplication The shelve notification has been tested by the _test_shelve_offload_server. (For this reason the testing of the shelve) _test_shelve_server is a duplication. Change-Id: Ie7a886f5b389c2f0bb9dc66129e4562cc09ba1b5 --- .../test_instance.py | 37 ++++--------------- 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/nova/tests/functional/notification_sample_tests/test_instance.py b/nova/tests/functional/notification_sample_tests/test_instance.py index c8472a73fd..4ef556f1b3 100644 --- a/nova/tests/functional/notification_sample_tests/test_instance.py +++ b/nova/tests/functional/notification_sample_tests/test_instance.py @@ -126,8 +126,7 @@ class TestInstanceNotificationSample( self._test_restore_server, self._test_suspend_resume_server, self._test_pause_unpause_server, - self._test_shelve_server, - self._test_shelve_offload_server, + self._test_shelve_and_shelve_offload_server, self._test_unshelve_server, self._test_resize_server, self._test_revert_server, @@ -393,9 +392,8 @@ class TestInstanceNotificationSample( 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[3]) - def _test_shelve_server(self, server): - self.flags(shelved_offload_time = -1) - + def _test_shelve_and_shelve_offload_server(self, server): + self.flags(shelved_offload_time=-1) self.api.post_server_action(server['id'], {'shelve': {}}) self._wait_for_state_change(self.api, server, expected_status='SHELVED') @@ -414,46 +412,27 @@ class TestInstanceNotificationSample( 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[1]) - post = {'unshelve': None} - self.api.post_server_action(server['id'], post) - - def _test_shelve_offload_server(self, server): - self.flags(shelved_offload_time=-1) - self.api.post_server_action(server['id'], {'shelve': {}}) - self._wait_for_state_change(self.api, server, - expected_status='SHELVED') + fake_notifier.reset() self.api.post_server_action(server['id'], {'shelveOffload': {}}) self._wait_for_state_change(self.api, server, expected_status='SHELVED_OFFLOADED') - self.assertEqual(4, len(fake_notifier.VERSIONED_NOTIFICATIONS)) - self._verify_notification( - 'instance-shelve-start', - replacements={ - 'reservation_id': server['reservation_id'], - 'uuid': server['id']}, - actual=fake_notifier.VERSIONED_NOTIFICATIONS[0]) - self._verify_notification( - 'instance-shelve-end', - replacements={ - 'reservation_id': server['reservation_id'], - 'uuid': server['id']}, - actual=fake_notifier.VERSIONED_NOTIFICATIONS[1]) - + self.assertEqual(2, len(fake_notifier.VERSIONED_NOTIFICATIONS)) self._verify_notification( 'instance-shelve_offload-start', replacements={ 'reservation_id': server['reservation_id'], 'uuid': server['id']}, - actual=fake_notifier.VERSIONED_NOTIFICATIONS[2]) + actual=fake_notifier.VERSIONED_NOTIFICATIONS[0]) self._verify_notification( 'instance-shelve_offload-end', replacements={ 'reservation_id': server['reservation_id'], 'uuid': server['id']}, - actual=fake_notifier.VERSIONED_NOTIFICATIONS[3]) + actual=fake_notifier.VERSIONED_NOTIFICATIONS[1]) self.api.post_server_action(server['id'], {'unshelve': None}) + self._wait_for_state_change(self.api, server, 'ACTIVE') def _test_unshelve_server(self, server): # setting the shelved_offload_time to 0 should set the