openstack/cinder
Code Issues Proposed changes

Tests: Set volume listen port to test_service_listen_port

Browse Source 
These tests can fail with an error binding to port 8776.
Using the same setting used by other tests allows these
to work reliably.

Change-Id: I64cc8a6e1cfc5fbae253d81d35b5edd1a03887ac
This commit is contained in:
Eric Harney
2016-02-10 15:10:48 -05:00
parent e88f0a486a
commit 0168056eb3
1 changed files with 6 additions and 0 deletions
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')
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")
self.assertEqual(processutils.get_worker_count(),
test_service.workers)
@@ -284,6 +286,8 @@ class TestWSGIService(test.TestCase):
@mock.patch('oslo_service.wsgi.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)
test_service = service.WSGIService("osapi_volume")
self.assertEqual(8, test_service.workers)
@@ -291,6 +295,8 @@ class TestWSGIService(test.TestCase):
@mock.patch('oslo_service.wsgi.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)
test_service = service.WSGIService("osapi_volume")
# If a value less than 1 is used, defaults to number of procs