openstack/shade
Code Issues Proposed changes

Fix a 60 second unit test

Browse Source 
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
This commit is contained in:
Monty Taylor
2015-11-20 09:31:04 -05:00
parent c84179154d
commit 27154a9c14
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
shade/tests/unit/test_create_server.py
View File

@@ -34,6 +34,7 @@ class TestCreateServer(base.TestCase):
config = os_client_config.OpenStackConfig() config = os_client_config.OpenStackConfig()
self.client = OpenStackCloud( self.client = OpenStackCloud(
cloud_config=config.get_one_cloud(validate=False)) cloud_config=config.get_one_cloud(validate=False))
self.client._SERVER_LIST_AGE = 0
def test_create_server_with_create_exception(self): def test_create_server_with_create_exception(self):
""" """
@@ -160,7 +161,8 @@ class TestCreateServer(base.TestCase):
'server-name', 'image-id', 'flavor-id', wait=True), 'server-name', 'image-id', 'flavor-id', wait=True),
fake_server) 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 Test that create_server with a wait throws an exception if the
server doesn't have addresses. server doesn't have addresses.
@@ -170,11 +172,13 @@ class TestCreateServer(base.TestCase):
fake_server = fakes.FakeServer('1234', '', 'ACTIVE') fake_server = fakes.FakeServer('1234', '', 'ACTIVE')
config = { config = {
"servers.create.return_value": build_server, "servers.create.return_value": build_server,
"servers.get.return_value": build_server, "servers.get.return_value": [build_server, None],
"servers.list.side_effect": [ "servers.list.side_effect": [
[build_server], [fake_server]] [build_server], [fake_server]],
"servers.delete.return_value": None,
} }
OpenStackCloud.nova_client = Mock(**config) OpenStackCloud.nova_client = Mock(**config)
self.client._SERVER_LIST_AGE = 0
with patch.object(OpenStackCloud, "add_ips_to_server", with patch.object(OpenStackCloud, "add_ips_to_server",
return_value=fake_server): return_value=fake_server):
self.assertRaises( self.assertRaises(