openstack
/
designate
Code Issues Proposed changes

Fix occasional failure in Service tests 

If another test is calling the rpc code, the
initialized flag will already be set.

Change-Id: I91bed3050ef253f3502ae3573bf36f211f65ed8c
This commit is contained in:
Erik Olof Gunnar Andersson 2023-12-08 04:10:11 -08:00
parent 55cc882706
commit 060a17ac65
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
designate/tests/unit/test_service.py
View File

@ -83,24 +83,31 @@ class TestBaseService(oslotest.base.BaseTestCase):
@mock.patch.object(policy, 'init')
@mock.patch.object(rpc, 'init')
@mock.patch.object(rpc, 'initialized')
@mock.patch.object(profiler, 'setup_profiler')
class TestServiceInit(oslotest.base.BaseTestCase):
def test_service_init(self, mock_setup_profiler, mock_rpc_init,
mock_policy_init):
def test_service_init(self, mock_setup_profiler, mock_rpc_initialized,
mock_rpc_init, mock_policy_init):
mock_rpc_initialized.return_value = False
service = designate_service.Service('test-service')
mock_rpc_initialized.assert_called_once()
mock_policy_init.assert_called_once()
mock_rpc_init.assert_called_once()
mock_setup_profiler.assert_called_once()
self.assertEqual('test-service', service.name)
def test_rpc_service_init(self, mock_setup_profiler, mock_rpc_init,
mock_policy_init):
def test_rpc_service_init(self, mock_setup_profiler, mock_rpc_initialized,
mock_rpc_init, mock_policy_init):
mock_rpc_initialized.return_value = False
service = designate_service.RPCService(
'test-rpc-service', 'test-topic'
)
mock_rpc_initialized.assert_called_once()
mock_policy_init.assert_called_once()
mock_rpc_init.assert_called_once()
mock_setup_profiler.assert_called_once()
@ -113,15 +120,20 @@ class TestServiceInit(oslotest.base.BaseTestCase):
class TestRpcService(oslotest.base.BaseTestCase):
@mock.patch.object(policy, 'init')
@mock.patch.object(rpc, 'init')
@mock.patch.object(rpc, 'initialized')
@mock.patch.object(profiler, 'setup_profiler')
def setUp(self, mock_setup_profiler, mock_rpc_init,
def setUp(self, mock_setup_profiler, mock_rpc_initialized, mock_rpc_init,
mock_policy_init):
super().setUp()
mock_rpc_initialized.return_value = False
self.service = designate_service.RPCService(
'test-rpc-service', 'test-topic'
)
mock_policy_init.assert_called_once()
mock_rpc_initialized.assert_called_once()
mock_rpc_init.assert_called_once()
mock_setup_profiler.assert_called_once()