From b1abfdd1d36a8d1d8afe82c6fd08a3e261dd9990 Mon Sep 17 00:00:00 2001 From: xhzhf Date: Thu, 15 Dec 2016 22:26:44 +0800 Subject: [PATCH] python3 has disable LOG.warn. python3 has disable LOG.warn. So replace LOG.warn with LOG.warning Story: 1650457 Task: 3923 Closes-Bug: #1650457 Change-Id: I44ff9553bf836a0730d5286496185bbfe16204b0 --- monasca_agent/collector/checks_d/kibana.py | 6 +++--- tests/checks_d/test_kibana.py | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/monasca_agent/collector/checks_d/kibana.py b/monasca_agent/collector/checks_d/kibana.py index c7bdaa75..587658c5 100644 --- a/monasca_agent/collector/checks_d/kibana.py +++ b/monasca_agent/collector/checks_d/kibana.py @@ -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) diff --git a/tests/checks_d/test_kibana.py b/tests/checks_d/test_kibana.py index cd3fa0e3..e95ea86a 100644 --- a/tests/checks_d/test_kibana.py +++ b/tests/checks_d/test_kibana.py @@ -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):