openstack/cinder
Code Issues Proposed changes

Merge "Tests: Set volume listen port to test_service_listen_port"

Browse Source
This commit is contained in:
Jenkins 2016-02-15 19:56:22 +00:00 committed by Gerrit Code Review
commit 67dd18df5b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/tests/unit/test_service.py
View File

@ -277,6 +277,8 @@ class TestWSGIService(test.TestCase):
@mock.patch('oslo_service.wsgi.Loader') @mock.patch('oslo_service.wsgi.Loader')
def test_workers_set_default(self, mock_loader): def test_workers_set_default(self, mock_loader):
self.override_config('osapi_volume_listen_port',
CONF.test_service_listen_port)
test_service = service.WSGIService("osapi_volume") test_service = service.WSGIService("osapi_volume")
self.assertEqual(processutils.get_worker_count(), self.assertEqual(processutils.get_worker_count(),
test_service.workers) test_service.workers)
@ -284,6 +286,8 @@ class TestWSGIService(test.TestCase):
@mock.patch('oslo_service.wsgi.Loader') @mock.patch('oslo_service.wsgi.Loader')
def test_workers_set_good_user_setting(self, mock_loader): def test_workers_set_good_user_setting(self, mock_loader):
self.override_config('osapi_volume_listen_port',
CONF.test_service_listen_port)
self.override_config('osapi_volume_workers', 8) self.override_config('osapi_volume_workers', 8)
test_service = service.WSGIService("osapi_volume") test_service = service.WSGIService("osapi_volume")
self.assertEqual(8, test_service.workers) self.assertEqual(8, test_service.workers)
@ -291,6 +295,8 @@ class TestWSGIService(test.TestCase):
@mock.patch('oslo_service.wsgi.Loader') @mock.patch('oslo_service.wsgi.Loader')
def test_workers_set_zero_user_setting(self, mock_loader): def test_workers_set_zero_user_setting(self, mock_loader):
self.override_config('osapi_volume_listen_port',
CONF.test_service_listen_port)
self.override_config('osapi_volume_workers', 0) self.override_config('osapi_volume_workers', 0)
test_service = service.WSGIService("osapi_volume") test_service = service.WSGIService("osapi_volume")
# If a value less than 1 is used, defaults to number of procs # If a value less than 1 is used, defaults to number of procs