Remove usages of SSL related config options in utils
SSL support was removed by [1] which resulted in removal of some SSL related config options, but two config options 'key_file' and 'cert_file' are still used in utils.stash_conf_values() which is called in reload functionality. When SIGHUP is sent to the parent process, this usage causes it to crash and its children processes become orphaned, which then causes the reload test to be stale (fail). This change also includes: - Remove 2 attributes and the decorator that help to skip this test (self.diable, self.disabled_message, and @skip_if_disabled) [1] https://review.opendev.org/#/c/697969/5/glance/common/wsgi.py Change-Id: I361c9d0b53a67b1cc60f0f3012e22accdcc46055 Closes-Bug: #1855708
This commit is contained in:
parent
f267bd6cde
commit
30ece7aa28
glance
@ -557,10 +557,7 @@ def stash_conf_values():
|
||||
conf = {
|
||||
'bind_host': CONF.bind_host,
|
||||
'bind_port': CONF.bind_port,
|
||||
'tcp_keepidle': CONF.cert_file,
|
||||
'backlog': CONF.backlog,
|
||||
'key_file': CONF.key_file,
|
||||
'cert_file': CONF.cert_file
|
||||
}
|
||||
|
||||
return conf
|
||||
|
@ -23,7 +23,6 @@ from six.moves import http_client as http
|
||||
|
||||
from glance.tests import functional
|
||||
from glance.tests.utils import execute
|
||||
from glance.tests.utils import skip_if_disabled
|
||||
|
||||
TEST_VAR_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
|
||||
'../', 'var'))
|
||||
@ -49,8 +48,6 @@ class TestReload(functional.FunctionalTest):
|
||||
self.cleanup()
|
||||
self.workers = 1
|
||||
self.include_scrubber = False
|
||||
self.disabled = True
|
||||
self.disabled_message = "Reload is broken, Bug 1855708"
|
||||
|
||||
def tearDown(self):
|
||||
if not self.disabled:
|
||||
@ -105,7 +102,6 @@ class TestReload(functional.FunctionalTest):
|
||||
def _url(self, protocol, path):
|
||||
return '%s://127.0.0.1:%d%s' % (protocol, self.api_port, path)
|
||||
|
||||
@skip_if_disabled
|
||||
def test_reload(self):
|
||||
"""Test SIGHUP picks up new config values"""
|
||||
def check_pids(pre, post=None, workers=2):
|
||||
|
Loading…
x
Reference in New Issue
Block a user