openstack/aodh
Code Issues Proposed changes

Fix order of arguments in assertEqual

Browse Source 
Related-Bug: 1277104

Change-Id: I61c8d81b18267d776d2abdc77b538dfe43e1c6dd
This commit is contained in:
Lena Novokshonova 2014-11-17 16:41:10 +04:00
parent f09dd12c0e
commit f6053d5959
11 changed files with 737 additions and 746 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/tests/alarm/evaluator/test_threshold.py
View File

@ -138,7 +138,7 @@ class TestEvaluate(base.TestEvaluatorBase):
expected = [mock.call(alarm.alarm_id, state='insufficient data') expected = [mock.call(alarm.alarm_id, state='insufficient data')
for alarm in self.alarms] for alarm in self.alarms]
update_calls = self.api_client.alarms.set_state.call_args_list update_calls = self.api_client.alarms.set_state.call_args_list
self.assertEqual(update_calls, expected) self.assertEqual(expected, update_calls)
expected = [mock.call( expected = [mock.call(
alarm, alarm,
'ok', 'ok',

2
ceilometer/tests/compute/notifications/test_instance.py
View File

@ -622,7 +622,7 @@ class TestNotifications(base.BaseTestCase):
def _verify_user_metadata(self, metadata): def _verify_user_metadata(self, metadata):
self.assertIn('user_metadata', metadata) self.assertIn('user_metadata', metadata)
user_meta = metadata['user_metadata'] user_meta = metadata['user_metadata']
self.assertEqual(user_meta.get('server_group'), 'Group_A') self.assertEqual('Group_A', user_meta.get('server_group'))
self.assertNotIn('AutoScalingGroupName', user_meta) self.assertNotIn('AutoScalingGroupName', user_meta)
self.assertIn('foo_bar', user_meta) self.assertIn('foo_bar', user_meta)
self.assertNotIn('foo.bar', user_meta) self.assertNotIn('foo.bar', user_meta)

4
ceilometer/tests/compute/virt/libvirt/test_inspector.py
View File

@ -197,7 +197,7 @@ class TestLibvirtInspection(base.BaseTestCase):
return_value=(5L, 0L, 0L, return_value=(5L, 0L, 0L,
2L, 999999L))): 2L, 999999L))):
interfaces = list(self.inspector.inspect_vnics(self.instance_name)) interfaces = list(self.inspector.inspect_vnics(self.instance_name))
self.assertEqual(interfaces, []) self.assertEqual([], interfaces)
def test_inspect_disks(self): def test_inspect_disks(self):
dom_xml = """ dom_xml = """
@ -244,7 +244,7 @@ class TestLibvirtInspection(base.BaseTestCase):
return_value=(5L, 0L, 0L, return_value=(5L, 0L, 0L,
2L, 999999L))): 2L, 999999L))):
disks = list(self.inspector.inspect_disks(self.instance_name)) disks = list(self.inspector.inspect_disks(self.instance_name))
self.assertEqual(disks, []) self.assertEqual([], disks)
def test_inspect_memory_usage(self): def test_inspect_memory_usage(self):
fake_memory_stats = {'available': 51200L, 'unused': 25600L} fake_memory_stats = {'available': 51200L, 'unused': 25600L}

2
ceilometer/tests/image/test_notifications.py
View File

@ -94,7 +94,7 @@ class TestNotification(base.BaseTestCase):
def _verify_common_counter(self, c, name, volume): def _verify_common_counter(self, c, name, volume):
self.assertIsNotNone(c) self.assertIsNotNone(c)
self.assertEqual(c.name, name) self.assertEqual(name, c.name)
self.assertEqual(fake_uuid('c'), c.resource_id) self.assertEqual(fake_uuid('c'), c.resource_id)
self.assertEqual(NOW, c.timestamp) self.assertEqual(NOW, c.timestamp)
self.assertEqual(volume, c.volume) self.assertEqual(volume, c.volume)

6
ceilometer/tests/network/statistics/opendaylight/test_driver.py
View File

@ -159,14 +159,14 @@ class TestOpenDayLightDriverSpecial(_Base):
self.fake_odl_url, self.fake_odl_url,
self.fake_params, self.fake_params,
cache) cache)
self.assertEqual(self.get_flow_statistics.call_count, 1) self.assertEqual(1, self.get_flow_statistics.call_count)
cache = {} cache = {}
self.driver.get_sample_data('switch', self.driver.get_sample_data('switch',
self.fake_odl_url, self.fake_odl_url,
self.fake_params, self.fake_params,
cache) cache)
self.assertEqual(self.get_flow_statistics.call_count, 2) self.assertEqual(2, self.get_flow_statistics.call_count)
def test_multi_container(self): def test_multi_container(self):
cache = {} cache = {}
@ -174,7 +174,7 @@ class TestOpenDayLightDriverSpecial(_Base):
self.fake_odl_url, self.fake_odl_url,
self.fake_params_multi_container, self.fake_params_multi_container,
cache) cache)
self.assertEqual(self.get_flow_statistics.call_count, 2) self.assertEqual(2, self.get_flow_statistics.call_count)
self.assertIn('network.statistics.opendaylight', cache) self.assertIn('network.statistics.opendaylight', cache)

24
ceilometer/tests/network/statistics/test_statistics.py
View File

@ -104,15 +104,15 @@ class TestBaseGetSamples(base.BaseTestCase):
def _assert_sample(self, s, volume, resource_id, resource_metadata, def _assert_sample(self, s, volume, resource_id, resource_metadata,
timestamp): timestamp):
self.assertEqual(s.name, 'foo') self.assertEqual('foo', s.name)
self.assertEqual(s.type, sample.TYPE_CUMULATIVE) self.assertEqual(sample.TYPE_CUMULATIVE, s.type)
self.assertEqual(s.unit, 'bar') self.assertEqual('bar', s.unit)
self.assertEqual(s.volume, volume) self.assertEqual(volume, s.volume)
self.assertIsNone(s.user_id) self.assertIsNone(s.user_id)
self.assertIsNone(s.project_id) self.assertIsNone(s.project_id)
self.assertEqual(s.resource_id, resource_id) self.assertEqual(resource_id, s.resource_id)
self.assertEqual(s.timestamp, timestamp) self.assertEqual(timestamp, s.timestamp)
self.assertEqual(s.resource_metadata, resource_metadata) self.assertEqual(resource_metadata, s.resource_metadata)
def test_get_samples_one_driver_one_resource(self): def test_get_samples_one_driver_one_resource(self):
times = self._make_timestamps(2) times = self._make_timestamps(2)
@ -124,7 +124,7 @@ class TestBaseGetSamples(base.BaseTestCase):
samples = self._get_samples('http://foo') samples = self._get_samples('http://foo')
self.assertEqual(len(samples), 1) self.assertEqual(1, len(samples))
self._assert_sample(samples[0], 1, 'a', {'spam': 'egg'}, times[0]) self._assert_sample(samples[0], 1, 'a', {'spam': 'egg'}, times[0])
def test_get_samples_one_driver_two_resource(self): def test_get_samples_one_driver_two_resource(self):
@ -138,7 +138,7 @@ class TestBaseGetSamples(base.BaseTestCase):
samples = self._get_samples('http://foo', 'http://bar') samples = self._get_samples('http://foo', 'http://bar')
self.assertEqual(len(samples), 2) self.assertEqual(2, len(samples))
self._assert_sample(samples[0], 1, 'a', {'spam': 'egg'}, times[0]) self._assert_sample(samples[0], 1, 'a', {'spam': 'egg'}, times[0])
self._assert_sample(samples[1], 2, 'b', None, times[1]) self._assert_sample(samples[1], 2, 'b', None, times[1])
@ -155,7 +155,7 @@ class TestBaseGetSamples(base.BaseTestCase):
samples = self._get_samples('http://foo') samples = self._get_samples('http://foo')
self.assertEqual(len(samples), 1) self.assertEqual(1, len(samples))
self._assert_sample(samples[0], 1, 'a', {'spam': 'egg'}, times[0]) self._assert_sample(samples[0], 1, 'a', {'spam': 'egg'}, times[0])
def test_get_samples_multi_samples(self): def test_get_samples_multi_samples(self):
@ -168,7 +168,7 @@ class TestBaseGetSamples(base.BaseTestCase):
samples = self._get_samples('http://foo') samples = self._get_samples('http://foo')
self.assertEqual(len(samples), 2) self.assertEqual(2, len(samples))
self._assert_sample(samples[0], 1, 'a', {'spam': 'egg'}, times[0]) self._assert_sample(samples[0], 1, 'a', {'spam': 'egg'}, times[0])
self._assert_sample(samples[1], 2, 'b', None, times[1]) self._assert_sample(samples[1], 2, 'b', None, times[1])
@ -179,7 +179,7 @@ class TestBaseGetSamples(base.BaseTestCase):
samples = self._get_samples('http://foo') samples = self._get_samples('http://foo')
self.assertEqual(len(samples), 0) self.assertEqual(0, len(samples))
def test_get_samples_return_no_generator(self): def test_get_samples_return_no_generator(self):
class NoneFakeDriver(driver.Driver): class NoneFakeDriver(driver.Driver):

20
ceilometer/tests/orchestration/test_notifications.py
View File

@ -92,24 +92,24 @@ class TestNotification(base.BaseTestCase):
def _verify_common_sample(self, s, name, volume): def _verify_common_sample(self, s, name, volume):
self.assertIsNotNone(s) self.assertIsNotNone(s)
self.assertEqual(s.name, 'stack.%s' % name) self.assertEqual('stack.%s' % name, s.name)
self.assertEqual(s.timestamp, NOW) self.assertEqual(NOW, s.timestamp)
self.assertEqual(s.type, sample.TYPE_DELTA) self.assertEqual(sample.TYPE_DELTA, s.type)
self.assertEqual(s.project_id, TENANT_ID) self.assertEqual(TENANT_ID, s.project_id)
self.assertEqual(s.resource_id, STACK_ARN) self.assertEqual(STACK_ARN, s.resource_id)
metadata = s.resource_metadata metadata = s.resource_metadata
self.assertEqual(metadata.get('host'), self.assertEqual(u'orchestration.node-n5x66lxdy67d',
u'orchestration.node-n5x66lxdy67d') metadata.get('host'))
def _test_operation(self, operation, trust=None): def _test_operation(self, operation, trust=None):
notif = stack_notification_for(operation, trust) notif = stack_notification_for(operation, trust)
handler = notifications.StackCRUD(mock.Mock()) handler = notifications.StackCRUD(mock.Mock())
data = list(handler.process_notification(notif)) data = list(handler.process_notification(notif))
self.assertEqual(len(data), 1) self.assertEqual(1, len(data))
if trust: if trust:
self.assertEqual(data[0].user_id, TRUSTOR_ID) self.assertEqual(TRUSTOR_ID, data[0].user_id)
else: else:
self.assertEqual(data[0].user_id, USER_ID) self.assertEqual(USER_ID, data[0].user_id)
self._verify_common_sample(data[0], operation, 1) self._verify_common_sample(data[0], operation, 1)
def test_create(self): def test_create(self):

2
ceilometer/tests/storage/test_get_connection.py
View File

@ -58,7 +58,7 @@ class ConnectionRetryTest(base.BaseTestCase):
storage.get_connection_from_config(self.CONF) storage.get_connection_from_config(self.CONF)
except RuntimeError as err: except RuntimeError as err:
self.assertIn('no-such-engine', six.text_type(err)) self.assertIn('no-such-engine', six.text_type(err))
self.assertEqual(retry_sleep.call_count, 9) self.assertEqual(9, retry_sleep.call_count)
retry_sleep.assert_called_with(10.0) retry_sleep.assert_called_with(10.0)

1369
ceilometer/tests/storage/test_storage_scenarios.py
View File

File diff suppressed because it is too large Load Diff

10
ceilometer/tests/test_coordination.py
View File

@ -162,17 +162,17 @@ class TestPartitioning(base.BaseTestCase):
dict(agent_id='agent2', group_id='group')] dict(agent_id='agent2', group_id='group')]
self._usage_simulation(*agents) self._usage_simulation(*agents)
self.assertEqual(sorted(self.shared_storage.keys()), ['group']) self.assertEqual(['group'], sorted(self.shared_storage.keys()))
self.assertEqual(sorted(self.shared_storage['group'].keys()), self.assertEqual(['agent1', 'agent2'],
['agent1', 'agent2']) sorted(self.shared_storage['group'].keys()))
def test_multiple_groups(self): def test_multiple_groups(self):
agents = [dict(agent_id='agent1', group_id='group1'), agents = [dict(agent_id='agent1', group_id='group1'),
dict(agent_id='agent2', group_id='group2')] dict(agent_id='agent2', group_id='group2')]
self._usage_simulation(*agents) self._usage_simulation(*agents)
self.assertEqual(sorted(self.shared_storage.keys()), ['group1', self.assertEqual(['group1', 'group2'],
'group2']) sorted(self.shared_storage.keys()))
def test_partitioning(self): def test_partitioning(self):
all_resources = ['resource_%s' % i for i in range(1000)] all_resources = ['resource_%s' % i for i in range(1000)]

42
ceilometer/tests/test_decoupled_pipeline.py
View File

@ -146,19 +146,19 @@ class TestDecoupledPipeline(pipeline_base.BasePipelineTestCase):
with pipeline_manager.publisher(None) as p: with pipeline_manager.publisher(None) as p:
p([self.test_counter]) p([self.test_counter])
self.assertEqual(len(pipeline_manager.pipelines), 2) self.assertEqual(2, len(pipeline_manager.pipelines))
self.assertEqual(str(pipeline_manager.pipelines[0]), self.assertEqual('test_source:test_sink',
'test_source:test_sink') str(pipeline_manager.pipelines[0]))
self.assertEqual(str(pipeline_manager.pipelines[1]), self.assertEqual('test_source:second_sink',
'test_source:second_sink') str(pipeline_manager.pipelines[1]))
test_publisher = pipeline_manager.pipelines[0].publishers[0] test_publisher = pipeline_manager.pipelines[0].publishers[0]
new_publisher = pipeline_manager.pipelines[1].publishers[0] new_publisher = pipeline_manager.pipelines[1].publishers[0]
for publisher, sfx in [(test_publisher, '_update'), for publisher, sfx in [(test_publisher, '_update'),
(new_publisher, '_new')]: (new_publisher, '_new')]:
self.assertEqual(len(publisher.samples), 2) self.assertEqual(2, len(publisher.samples))
self.assertEqual(publisher.calls, 2) self.assertEqual(2, publisher.calls)
self.assertEqual(getattr(publisher.samples[0], "name"), 'a' + sfx) self.assertEqual('a' + sfx, getattr(publisher.samples[0], "name"))
self.assertEqual(getattr(publisher.samples[1], "name"), 'b' + sfx) self.assertEqual('b' + sfx, getattr(publisher.samples[1], "name"))
def test_multiple_sources_with_single_sink(self): def test_multiple_sources_with_single_sink(self):
self.pipeline_cfg['sources'].append({ self.pipeline_cfg['sources'].append({
@ -189,23 +189,23 @@ class TestDecoupledPipeline(pipeline_base.BasePipelineTestCase):
with pipeline_manager.publisher(None) as p: with pipeline_manager.publisher(None) as p:
p([self.test_counter]) p([self.test_counter])
self.assertEqual(len(pipeline_manager.pipelines), 2) self.assertEqual(2, len(pipeline_manager.pipelines))
self.assertEqual(str(pipeline_manager.pipelines[0]), self.assertEqual('test_source:test_sink',
'test_source:test_sink') str(pipeline_manager.pipelines[0]))
self.assertEqual(str(pipeline_manager.pipelines[1]), self.assertEqual('second_source:test_sink',
'second_source:test_sink') str(pipeline_manager.pipelines[1]))
test_publisher = pipeline_manager.pipelines[0].publishers[0] test_publisher = pipeline_manager.pipelines[0].publishers[0]
another_publisher = pipeline_manager.pipelines[1].publishers[0] another_publisher = pipeline_manager.pipelines[1].publishers[0]
for publisher in [test_publisher, another_publisher]: for publisher in [test_publisher, another_publisher]:
self.assertEqual(len(publisher.samples), 2) self.assertEqual(2, len(publisher.samples))
self.assertEqual(publisher.calls, 2) self.assertEqual(2, publisher.calls)
self.assertEqual(getattr(publisher.samples[0], "name"), 'a_update') self.assertEqual('a_update', getattr(publisher.samples[0], "name"))
self.assertEqual(getattr(publisher.samples[1], "name"), 'b_update') self.assertEqual('b_update', getattr(publisher.samples[1], "name"))
transformed_samples = self.TransformerClass.samples transformed_samples = self.TransformerClass.samples
self.assertEqual(len(transformed_samples), 2) self.assertEqual(2, len(transformed_samples))
self.assertEqual([getattr(s, 'name') for s in transformed_samples], self.assertEqual(['a', 'b'],
['a', 'b']) [getattr(s, 'name') for s in transformed_samples])
def _do_test_rate_of_change_in_boilerplate_pipeline_cfg(self, index, def _do_test_rate_of_change_in_boilerplate_pipeline_cfg(self, index,
meters, units): meters, units):