openstack/aodh
Code Issues Proposed changes

assertEquals is deprecated, use assertEqual

Browse Source 
Also replace assert_ with more specific test predicates.

Change-Id: Ie91b1aff39a1119c456b0b76602c978531eb0025
This commit is contained in:
Dirk Mueller 2013-10-01 09:09:06 +02:00
parent 70c4256856
commit 27d5d913b8
10 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/api/v1/test_list_sources_scenarios.py
View File

@ -30,7 +30,7 @@ class TestListSource(tests_api.TestBase,
def test_source(self):
ydata = self.get('/sources/test_source')
self.assert_("somekey" in ydata)
self.assertIn("somekey", ydata)
self.assertEqual(ydata["somekey"], 666)
def test_unknownsource(self):

2
tests/api/v2/test_list_events_scenarios.py
View File

@ -166,7 +166,7 @@ class TestListEvents(FunctionalTest,
'value': 'resource-id',
}])
sample = data[0]
self.assert_('resource_metadata' in sample)
self.assertIn('resource_metadata', sample)
self.assertEqual(
list(sorted(sample['resource_metadata'].iteritems())),
[('dict_properties.key', 'value'),

78
tests/api/v2/test_list_meters_scenarios.py
View File

@ -213,14 +213,14 @@ class TestListMeters(FunctionalTest,
'value': '0',
'type': 'integer'}]
)
self.assertEquals(2, len(data))
self.assertEquals(set(r['resource_id'] for r in data),
set(['resource-id',
'resource-id3']))
self.assertEquals(set(r['counter_name'] for r in data),
set(['meter.test']))
self.assertEquals(set(r['resource_metadata']['size'] for r in data),
set(['0']))
self.assertEqual(2, len(data))
self.assertEqual(set(r['resource_id'] for r in data),
set(['resource-id',
'resource-id3']))
self.assertEqual(set(r['counter_name'] for r in data),
set(['meter.test']))
self.assertEqual(set(r['resource_metadata']['size'] for r in data),
set(['0']))
def test_list_meters_query_float_metadata(self):
data = self.get_json('/meters/meter.test',
@ -229,14 +229,14 @@ class TestListMeters(FunctionalTest,
'value': '0.75',
'type': 'float'}]
)
self.assertEquals(2, len(data))
self.assertEquals(set(r['resource_id'] for r in data),
set(['resource-id',
'resource-id3']))
self.assertEquals(set(r['counter_name'] for r in data),
set(['meter.test']))
self.assertEquals(set(r['resource_metadata']['util'] for r in data),
set(['0.75']))
self.assertEqual(2, len(data))
self.assertEqual(set(r['resource_id'] for r in data),
set(['resource-id',
'resource-id3']))
self.assertEqual(set(r['counter_name'] for r in data),
set(['meter.test']))
self.assertEqual(set(r['resource_metadata']['util'] for r in data),
set(['0.75']))
def test_list_meters_query_boolean_metadata(self):
data = self.get_json('/meters/meter.mine',
@ -245,13 +245,13 @@ class TestListMeters(FunctionalTest,
'value': 'False',
'type': 'boolean'}]
)
self.assertEquals(1, len(data))
self.assertEquals(set(r['resource_id'] for r in data),
set(['resource-id2']))
self.assertEquals(set(r['counter_name'] for r in data),
set(['meter.mine']))
self.assertEquals(set(r['resource_metadata']['is_public'] for r
in data), set(['False']))
self.assertEqual(1, len(data))
self.assertEqual(set(r['resource_id'] for r in data),
set(['resource-id2']))
self.assertEqual(set(r['counter_name'] for r in data),
set(['meter.mine']))
self.assertEqual(set(r['resource_metadata']['is_public'] for r
in data), set(['False']))
def test_list_meters_query_string_metadata(self):
data = self.get_json('/meters/meter.test',
@ -259,13 +259,13 @@ class TestListMeters(FunctionalTest,
'op': 'eq',
'value': 'self.sample'}]
)
self.assertEquals(1, len(data))
self.assertEquals(set(r['resource_id'] for r in data),
set(['resource-id']))
self.assertEquals(set(r['counter_name'] for r in data),
set(['meter.test']))
self.assertEquals(set(r['resource_metadata']['tag'] for r in data),
set(['self.sample']))
self.assertEqual(1, len(data))
self.assertEqual(set(r['resource_id'] for r in data),
set(['resource-id']))
self.assertEqual(set(r['counter_name'] for r in data),
set(['meter.test']))
self.assertEqual(set(r['resource_metadata']['tag'] for r in data),
set(['self.sample']))
def test_list_meters_query_integer_float_metadata_without_type(self):
data = self.get_json('/meters/meter.test',
@ -276,15 +276,15 @@ class TestListMeters(FunctionalTest,
'op': 'eq',
'value': '0.75'}]
)
self.assertEquals(1, len(data))
self.assertEquals(set(r['resource_id'] for r in data),
set(['resource-id3']))
self.assertEquals(set(r['counter_name'] for r in data),
set(['meter.test']))
self.assertEquals(set(r['resource_metadata']['size'] for r in data),
set(['0']))
self.assertEquals(set(r['resource_metadata']['util'] for r in data),
set(['0.75']))
self.assertEqual(1, len(data))
self.assertEqual(set(r['resource_id'] for r in data),
set(['resource-id3']))
self.assertEqual(set(r['counter_name'] for r in data),
set(['meter.test']))
self.assertEqual(set(r['resource_metadata']['size'] for r in data),
set(['0']))
self.assertEqual(set(r['resource_metadata']['util'] for r in data),
set(['0.75']))
def test_with_resource(self):
data = self.get_json('/meters', q=[{'field': 'resource_id',

4
tests/api/v2/test_statistics_scenarios.py
View File

@ -186,7 +186,7 @@ class TestMaxResourceVolume(base.FunctionalTest,
q=[{'field': 'resource_id',
'value': 'resource-id'}],
period=-1)
self.assertEquals(400, resp.status_code)
self.assertEqual(400, resp.status_code)
def test_start_timestamp(self):
data = self.get_json(self.PATH, q=[{'field': 'resource_id',
@ -636,7 +636,7 @@ class TestGroupByInstance(base.FunctionalTest,
response = self.get_json(self.PATH,
expect_errors=True,
groupby=['wtf'])
self.assertEquals(400, response.status_code)
self.assertEqual(400, response.status_code)
def test_group_by_multiple_regular(self):
data = self.get_json(self.PATH, groupby=['user_id', 'resource_id'])

2
tests/image/test_glance.py
View File

@ -159,7 +159,7 @@ class TestImagePollster(base.TestCase):
{}))
self.assertEqual(len(samples), 3)
for image in IMAGE_LIST:
self.assert_(
self.assertTrue(
any(map(lambda sample: sample.volume == image.size,
samples)))

4
tests/storage/test_base.py
View File

@ -58,5 +58,5 @@ class BaseTest(test_base.TestCase):
self.assertEqual(sort_keys_meter, ['foo', 'user_id', 'project_id'])
sort_keys_resource = base._handle_sort_key('resource', 'project_id')
self.assertEquals(sort_keys_resource,
['project_id', 'user_id', 'timestamp'])
self.assertEqual(sort_keys_resource,
['project_id', 'user_id', 'timestamp'])

4
tests/storage/test_impl_sqlalchemy.py
View File

@ -122,9 +122,9 @@ class EventTest(EventTestBase):
with patch.object(self.conn, "_record_event") as mock_save:
mock_save.side_effect = MyException("Boom")
problem_events = self.conn.record_events(m)
self.assertEquals(2, len(problem_events))
self.assertEqual(2, len(problem_events))
for bad, event in problem_events:
self.assertEquals(models.Event.UNKNOWN_PROBLEM, bad)
self.assertEqual(models.Event.UNKNOWN_PROBLEM, bad)
def test_get_none_value_traits(self):
model = sql_models.Trait(None, None, 5)

2
tests/storage/test_models.py
View File

@ -53,4 +53,4 @@ class ModelTest(base.TestCase):
def test_event_repr_no_traits(self):
x = models.Event("1", "name", "now", None)
self.assertEquals("<Event: 1, name, now, >", repr(x))
self.assertEqual("<Event: 1, name, now, >", repr(x))

4
tests/storage/test_storage_scenarios.py
View File

@ -2089,9 +2089,9 @@ class EventTest(EventTestBase):
m = [models.Event("1", "Foo", now, None),
models.Event("1", "Zoo", now, [])]
problem_events = self.conn.record_events(m)
self.assertEquals(1, len(problem_events))
self.assertEqual(1, len(problem_events))
bad = problem_events[0]
self.assertEquals(models.Event.DUPLICATE, bad[0])
self.assertEqual(models.Event.DUPLICATE, bad[0])
def test_save_events_no_traits(self):
now = datetime.datetime.utcnow()

6
tests/test_service.py
View File

@ -154,9 +154,9 @@ class ServiceRestartTest(base.TestCase):
self.assertTrue(self.check_process_alive())
self.assertTrue(self.parse_output("Caught SIGHUP").ret)
self.assertEquals(self.pipeline_cfg,
yaml.safe_load(
self.parse_output("Pipeline config: ").ret_stream))
self.assertEqual(self.pipeline_cfg,
yaml.safe_load(
self.parse_output("Pipeline config: ").ret_stream))
def test_compute_service_restart(self):
self._service_restart('ceilometer-agent-compute')