openstack
/
monasca-agent
Code Issues Proposed changes

Merge "python3 has disable LOG.warn."

This commit is contained in:
Jenkins 2017-05-31 07:59:20 +00:00 committed by Gerrit Code Review
parent 3a4d5c5ce9 b1abfdd1d3
commit 79d2b884e0
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
monasca_agent/collector/checks_d/kibana.py
View File

@ -47,8 +47,8 @@ class Kibana(checks.AgentCheck):
instance_metrics = instance.get('metrics', None)
if not instance_metrics:
LOG.warn('All metrics have been disabled in configuration '
'file, nothing to do.')
LOG.warning('All metrics have been disabled in configuration '
'file, nothing to do.')
return
version = self._get_kibana_version(config_url)
@ -65,7 +65,7 @@ class Kibana(checks.AgentCheck):
return
if not stats:
LOG.warn('No stats data was collected from kibana')
LOG.warning('No stats data was collected from kibana')
return
self._process_metrics(stats, dimensions, instance_metrics)

16
tests/checks_d/test_kibana.py
View File

@ -62,8 +62,8 @@ class KibanaCheckTest(unittest.TestCase):
def test_should_early_exit_if_all_metrics_disabled(self):
with contextlib.nested(
mock.patch.object(util, 'get_hostname'),
mock.patch.object(LOG, 'warn')
) as (_, mock_log_warn):
mock.patch.object(LOG, 'warning')
) as (_, mock_log_warning):
self.kibana_check._get_kibana_version = mock.Mock()
self.kibana_check._get_data = mock.Mock()
self.kibana_check._process_metrics = mock.Mock()
@ -74,8 +74,8 @@ class KibanaCheckTest(unittest.TestCase):
self.assertFalse(self.kibana_check._get_data.called)
self.assertFalse(self.kibana_check._process_metrics.called)
self.assertEqual(mock_log_warn.call_count, 1)
self.assertEqual(mock_log_warn.call_args[0][0],
self.assertEqual(mock_log_warning.call_count, 1)
self.assertEqual(mock_log_warning.call_args[0][0],
'All metrics have been disabled in configuration '
'file, nothing to do.')
@ -110,8 +110,8 @@ class KibanaCheckTest(unittest.TestCase):
def test_empty_data_returned(self):
with contextlib.nested(
mock.patch.object(util, 'get_hostname'),
mock.patch.object(LOG, 'warn')
) as (_, mock_log_warn):
mock.patch.object(LOG, 'warning')
) as (_, mock_log_warning):
self.kibana_check._get_data = mock.Mock(return_value=None)
self.kibana_check.check({
@ -123,8 +123,8 @@ class KibanaCheckTest(unittest.TestCase):
'resp_time_max']
})
self.assertEqual(mock_log_warn.call_count, 1)
self.assertEqual(mock_log_warn.call_args[0][0],
self.assertEqual(mock_log_warning.call_count, 1)
self.assertEqual(mock_log_warning.call_args[0][0],
'No stats data was collected from kibana')
def test_process_metrics(self):