openstack
/
oslo.messaging
Code Issues Proposed changes

Merge "Bump bandit and make oslo.messaging compatible with latest rules"

This commit is contained in:
Zuul 2023-10-20 13:47:33 +00:00 committed by Gerrit Code Review
parent b45733ad92 ee13e53614
commit f455edd601
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oslo_messaging/_metrics/client.py
View File

@ -39,13 +39,14 @@ else:
# we will facing an issue by trying to override the threading module. # we will facing an issue by trying to override the threading module.
stdlib_threading = threading stdlib_threading = threading
oslo_messaging_metrics = [ oslo_messaging_metrics = [
cfg.BoolOpt('metrics_enabled', default=False, cfg.BoolOpt('metrics_enabled', default=False,
help='Boolean to send rpc metrics to oslo.metrics.'), help='Boolean to send rpc metrics to oslo.metrics.'),
cfg.IntOpt('metrics_buffer_size', default=1000, cfg.IntOpt('metrics_buffer_size', default=1000,
help='Buffer size to store in oslo.messaging.'), help='Buffer size to store in oslo.messaging.'),
cfg.StrOpt('metrics_socket_file', cfg.StrOpt('metrics_socket_file',
default='/var/tmp/metrics_collector.sock', default='/var/tmp/metrics_collector.sock', # nosec
help='Unix domain socket file to be used' help='Unix domain socket file to be used'
' to send rpc related metrics'), ' to send rpc related metrics'),
cfg.StrOpt('metrics_process_name', cfg.StrOpt('metrics_process_name',

2
oslo_messaging/tests/functional/test_functional.py
View File

@ -590,7 +590,7 @@ class MetricsTestCase(utils.SkipIfNoTransportURL):
client = group.client(1) client = group.client(1)
client.add(increment=1) client.add(increment=1)
time.sleep(1) time.sleep(1)
r = requests.get('http://localhost:3000') r = requests.get('http://localhost:3000', timeout=10)
for line in r.text.split('\n'): for line in r.text.split('\n'):
if 'client_invocation_start_total{' in line: if 'client_invocation_start_total{' in line:
self.assertEqual('1.0', line[-3:]) self.assertEqual('1.0', line[-3:])

2
test-requirements.txt
View File

@ -26,7 +26,7 @@ coverage!=4.4,>=4.0 # Apache-2.0
pyngus>=2.2.0 # Apache-2.0 pyngus>=2.2.0 # Apache-2.0
# Bandit security code scanner # Bandit security code scanner
bandit>=1.6.0,<1.7.0 # Apache-2.0 bandit>=1.7.0,<1.8.0 # Apache-2.0
eventlet>=0.23.0 # MIT eventlet>=0.23.0 # MIT
greenlet>=0.4.15 # MIT greenlet>=0.4.15 # MIT