From 27154a9c14ea7c3fc03147043f8a3093b14a1a1f Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 20 Nov 2015 09:31:04 -0500 Subject: [PATCH] Fix a 60 second unit test The no-addresses test was waiting for delete timeout and was therefore sticking around for 60 seconds for a sideeffect we did not care about. Add a second get return value so that the get in delete returns without a wait-poll loop. Also, set the list server interval to 0 so that we done have a bunch of tests with a single 6 second wait. Change-Id: Ia62ace386a183892f9446aee4e9d4cbbee528dec --- shade/tests/unit/test_create_server.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/shade/tests/unit/test_create_server.py b/shade/tests/unit/test_create_server.py index 2ed172a65..8abf6cc4d 100644 --- a/shade/tests/unit/test_create_server.py +++ b/shade/tests/unit/test_create_server.py @@ -34,6 +34,7 @@ class TestCreateServer(base.TestCase): config = os_client_config.OpenStackConfig() self.client = OpenStackCloud( cloud_config=config.get_one_cloud(validate=False)) + self.client._SERVER_LIST_AGE = 0 def test_create_server_with_create_exception(self): """ @@ -160,7 +161,8 @@ class TestCreateServer(base.TestCase): 'server-name', 'image-id', 'flavor-id', wait=True), fake_server) - def test_create_server_no_addresses(self): + @patch('time.sleep') + def test_create_server_no_addresses(self, mock_sleep): """ Test that create_server with a wait throws an exception if the server doesn't have addresses. @@ -170,11 +172,13 @@ class TestCreateServer(base.TestCase): fake_server = fakes.FakeServer('1234', '', 'ACTIVE') config = { "servers.create.return_value": build_server, - "servers.get.return_value": build_server, + "servers.get.return_value": [build_server, None], "servers.list.side_effect": [ - [build_server], [fake_server]] + [build_server], [fake_server]], + "servers.delete.return_value": None, } OpenStackCloud.nova_client = Mock(**config) + self.client._SERVER_LIST_AGE = 0 with patch.object(OpenStackCloud, "add_ips_to_server", return_value=fake_server): self.assertRaises(