openstack/monasca-agent
Code Issues Proposed changes

TrivialFix: Using assertEqual instead of assertEquals

Browse Source 
Following OpenStack Style Guidelines[1]: http://docs.openstack.org/developer/hacking/#unit-tests-and-assertraises
[H234] assertEquals() logs a DeprecationWarning in Python 3.x,
use assertEqual() instead. The same goes for assertNotEquals().

Change-Id: Ifead6a86460107c0495ba00412853361ecef6e3e
This commit is contained in:
Nam Nguyen Hoai 2016-09-28 14:09:13 +07:00
parent 84880ba0ee
commit 6145e5e63d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/checks_d/test_kibana.py
View File

@ -156,8 +156,8 @@ class KibanaCheckTest(unittest.TestCase):
self.kibana_check.check({'metrics': enabled_metrics})
self.assertTrue(self.kibana_check._process_metric.called)
self.assertEquals(len(enabled_metrics),
self.kibana_check._process_metric.call_count)
self.assertEqual(len(enabled_metrics),
self.kibana_check._process_metric.call_count)
def test_check(self):
fixture_file = os.path.dirname(
@ -194,7 +194,7 @@ class KibanaCheckTest(unittest.TestCase):
self.kibana_check.check({'metrics': metrics})
self.assertTrue(self.kibana_check.gauge.called)
self.assertEquals(89, self.kibana_check.gauge.call_count)
self.assertEqual(89, self.kibana_check.gauge.call_count)
for call_arg in self.kibana_check.gauge.call_args_list:
metric_name = call_arg[1]['metric']

14
tests/test_service_plugin.py
View File

@ -30,11 +30,11 @@ class TestKeystone(unittest.TestCase):
config = test_plugin.build_config()
http_instance = config['http_check']['instances'][0]
url = 'http://localhost:{0}/healthcheck'.format(port_used)
self.assertEquals(http_instance['url'], url)
self.assertEquals(http_instance['match_pattern'], '.*OK.*')
self.assertEqual(http_instance['url'], url)
self.assertEqual(http_instance['match_pattern'], '.*OK.*')
processes = config['process']['instances']
self.assertEquals(processes[0]['search_string'], ['nose'])
self.assertEqual(processes[0]['search_string'], ['nose'])
def test_override_values(self):
""" Test overriding values using args works
@ -49,12 +49,12 @@ class TestKeystone(unittest.TestCase):
config = test_plugin.build_config()
http_instance = config['http_check']['instances'][0]
self.assertEquals(http_instance['url'], url)
self.assertEquals(http_instance['match_pattern'], pattern)
self.assertEqual(http_instance['url'], url)
self.assertEqual(http_instance['match_pattern'], pattern)
processes = config['process']['instances']
self.assertEquals(processes[0]['search_string'], ['tox'])
self.assertEquals(processes[1]['search_string'], ['nose'])
self.assertEqual(processes[0]['search_string'], ['tox'])
self.assertEqual(processes[1]['search_string'], ['nose'])
class TestPlugin(monasca_setup.detection.ServicePlugin):