From a6b0a2f1290a8c9343869558f1fe7ed860f76899 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Tue, 22 Jul 2014 18:39:13 +0000 Subject: [PATCH] Revert "Add tests for wait_for_server_status" This unit test class added several race conditions to the unit tests as well as added a dependency on having a valid tempest config file. At this point instead of trying to fix all of these issues I'm pushing a revert in the short term and long-term we can just fix things and re-push these tests. This reverts commit ae7c9ac4aac20a2832fe1beeaac0a688c6accbd9. Change-Id: If6026611f3938be0716ce95491a8ee60a53e8c12 Closes-Bug: #1347096 --- tempest/tests/test_waiters.py | 219 ---------------------------------- 1 file changed, 219 deletions(-) diff --git a/tempest/tests/test_waiters.py b/tempest/tests/test_waiters.py index a29cb46fbb..1f9825e43e 100644 --- a/tempest/tests/test_waiters.py +++ b/tempest/tests/test_waiters.py @@ -15,7 +15,6 @@ import time import mock -import testtools from tempest.common import waiters from tempest import exceptions @@ -48,221 +47,3 @@ class TestImageWaiters(base.TestCase): self.assertRaises(exceptions.AddImageException, waiters.wait_for_image_status, self.client, 'fake_image_id', 'active') - - -class TestServerWaiters(base.TestCase): - def setUp(self): - super(TestServerWaiters, self).setUp() - self.client = mock.MagicMock() - self.client.build_timeout = 1 - self.client.build_interval = 1 - - def test_wait_for_server_status(self): - self.client.get_server.return_value = (None, {'status': - 'active'} - ) - start_time = int(time.time()) - waiters.wait_for_server_status(self.client, 'fake_svr_id', - 'active' - ) - end_time = int(time.time()) - # Ensure waiter returns before build_timeout - self.assertTrue((end_time - start_time) < 2) - - def test_wait_for_server_status_BUILD_from_not_UNKNOWN(self): - self.client.get_server.return_value = (None, {'status': 'active'}) - start_time = int(time.time()) - waiters.wait_for_server_status(self.client, 'fake_svr_id', - 'BUILD') - end_time = int(time.time()) - # Ensure waiter returns before build_timeout - self.assertTrue((end_time - start_time) < 2) - - def test_wait_for_server_status_ready_wait_with_BUILD(self): - self.client.get_server.return_value = (None, {'status': 'BUILD'}) - start_time = int(time.time()) - waiters.wait_for_server_status(self.client, 'fake_svr_id', - 'BUILD', True) - end_time = int(time.time()) - # Ensure waiter returns before build_timeout - self.assertTrue((end_time - start_time) < 2) - - def test_wait_for_server_status_ready_wait(self): - self.client.get_server.return_value = (None, {'status': - 'ERROR', - 'OS-EXT-STS:task_state': - 'n/a' - } - ) - self.client.get_console_output.return_value = (None, - {'output': 'Server fake_svr_id failed to reach ' - 'active status and task state n/a within the ' - 'required time (1 s).\nCurrent status: SUSPENDED.' - '\nCurrent task state: None.'} - ) - self.assertRaises(exceptions.BuildErrorException, - waiters.wait_for_server_status, - self.client, 'fake_svr_id', 'active', - ready_wait=True, extra_timeout=0, - raise_on_error=True - ) - - def test_wait_for_server_status_no_ready_wait(self): - self.client.get_server.return_value = (None, {'status': - 'ERROR', - 'OS-EXT-STS:task_state': - 'n/a' - } - ) - start_time = int(time.time()) - waiters.wait_for_server_status(self.client, 'fake_svr_id', - 'ERROR', ready_wait=False, - extra_timeout=10, raise_on_error=True - ) - end_time = int(time.time()) - # Ensure waiter returns before build_timeout + extra_timeout - self.assertTrue((end_time - start_time) < 12) - - def test_wait_for_server_status_timeout(self): - self.client.get_server.return_value = (None, {'status': 'SUSPENDED'}) - self.client.get_console_output.return_value = (None, - {'output': 'Server fake_svr_id failed to reach ' - 'active status and task state n/a within the ' - 'required time (1 s).\nCurrent status: SUSPENDED.' - '\nCurrent task state: None.'} - ) - self.assertRaises(exceptions.TimeoutException, - waiters.wait_for_server_status, - self.client, 'fake_svr_id', 'active') - - def test_wait_for_server_status_extra_timeout(self): - self.client.get_server.return_value = (None, {'status': 'SUSPENDED'}) - start_time = int(time.time()) - self.client.get_console_output.return_value = (None, - {'output': 'Server fake_svr_id failed to reach ' - 'active status and task state n/a within the ' - 'required time (10 s). \nCurrent status: SUSPENDED.' - '\nCurrent task state: None.'} - ) - self.assertRaises(exceptions.TimeoutException, - waiters.wait_for_server_status, - self.client, 'fake_svr_id', - 'active', ready_wait=True, - extra_timeout=10, raise_on_error=True - ) - end_time = int(time.time()) - # Ensure waiter returns after build_timeout but - # before build_timeout+extra timeout - self.assertTrue(10 < (end_time - start_time) < 12) - - def test_wait_for_server_status_error_on_server_create(self): - self.client.get_server.return_value = (None, {'status': 'ERROR'}) - self.client.get_console_output.return_value = (None, - {'output': 'Server fake_svr_id failed to reach ' - 'activestatus and task state n/a within the ' - 'required time (1 s).\nCurrent status: ERROR.' - '\nCurrent task state: None.'} - ) - self.assertRaises(exceptions.BuildErrorException, - waiters.wait_for_server_status, - self.client, 'fake_svr_id', 'active') - - def test_wait_for_server_status_no_raise_on_error(self): - self.client.get_server.return_value = (None, {'status': 'ERROR'}) - self.client.get_console_output.return_value = (None, - {'output': 'Server fake_svr_id failed to reach ' - 'activestatus and task state n/a within the ' - 'required time (1 s).\nCurrent status: ERROR.' - '\nCurrent task state: None.'} - ) - self.assertRaises(exceptions.TimeoutException, - waiters.wait_for_server_status, - self.client, 'fake_svr_id', 'active', - ready_wait=True, extra_timeout=0, - raise_on_error=False - ) - - def test_wait_for_server_status_no_ready_wait_timeout(self): - self.client.get_server.return_value = (None, {'status': 'ERROR'}) - self.client.get_console_output.return_value = (None, - {'output': 'Server fake_svr_id failed to reach ' - 'active status and task state n/a within the ' - 'required time (11 s).\nCurrent status: ERROR.' - '\nCurrent task state: None.'} - ) - expected_msg = '''Request timed out -Details: (TestServerWaiters:test_wait_for_server_status_no_ready_wait_timeout)\ - Server fake_svr_id failed to reach active status and task state "n/a" within\ - the required time (11 s). Current status: ERROR. Current task state: None.\ -''' - with testtools.ExpectedException(exceptions.TimeoutException, - testtools.matchers.AfterPreprocessing( - str, - testtools.matchers.Equals(expected_msg) - ) - ): - waiters.wait_for_server_status(self.client, 'fake_svr_id', - 'active', ready_wait=False, - extra_timeout=10, - raise_on_error=False - ) - - def test_wait_for_server_status_ready_wait_timeout(self): - self.client.get_server.return_value = (None, {'status': 'ERROR'}) - self.client.get_console_output.return_value = (None, - {'output': 'Server fake_svr_id failed to reach ' - 'activestatus and task state n/a within the ' - 'required time (11 s).\nCurrent status: ERROR.' - '\nCurrent task state: None.'} - ) - expected_msg = '''Request timed out -Details: (TestServerWaiters:test_wait_for_server_status_ready_wait_timeout)\ - Server fake_svr_id failed to reach active status and task state "None" within\ - the required time (11 s). Current status: ERROR. Current task state: None.\ -''' - with testtools.ExpectedException(exceptions.TimeoutException, - testtools.matchers.AfterPreprocessing( - str, - testtools.matchers.Equals(expected_msg) - ) - ): - waiters.wait_for_server_status(self.client, 'fake_svr_id', - 'active', ready_wait=True, - extra_timeout=10, - raise_on_error=False - ) - - def test_wait_for_changing_server_status(self): - self.client.get_server.side_effect = [(None, {'status': 'BUILD'}), - (None, {'status': 'active'})] - start_time = int(time.time()) - waiters.wait_for_server_status(self.client, 'fake_svr_id', - 'active', ready_wait=True, - extra_timeout=10, - raise_on_error=True - ) - end_time = int(time.time()) - # Ensure waiter returns before build_timeout + extra_timeout - self.assertTrue((end_time - start_time) < 12) - - def test_wait_for_changing_server_task_status(self): - self.client.get_server.side_effect = [(None, {'status': 'BUILD', - 'OS-EXT-STS:task_state': - 'n/a' - } - ), - (None, {'status': 'active', - 'OS-EXT-STS:task_state': - 'None' - } - ) - ] - start_time = int(time.time()) - waiters.wait_for_server_status(self.client, 'fake_svr_id', - 'active', ready_wait=True, - extra_timeout=10, - raise_on_error=True - ) - end_time = int(time.time()) - # Ensure waiter returns before build_timeout + extra_timeout - self.assertTrue((end_time - start_time) < 12)