openstack
/
ceilometer
Code Issues Proposed changes

Edits assert methods 

Makes changes to the following files:
  tests/agentbase.py
  tests/alarm/partition/test_coordination.py
  tests/api/v2/test_alarm_scenarios.py
  tests/api/v2/test_event_scenarios.py
  tests/api/v2/test_list_resources_scenarios.py
  tests/api/v2/test_statistics_scenarios.py
  tests/compute/virt/vmware/test_inspector.py
  tests/ipmi/platform/test_ipmi_sensor.py
  tests/objectstore/test_swift.py
  tests/publisher/test_file.py
  tests/storage/test_storage_scenarios.py

Replaces assertTrue(a in b) with assertIn(a, b).

Change-Id: I00d6b194dab0026558376e2fb052ff7b094dff32
This commit is contained in:
nellysmitt 2014-10-20 11:36:00 +00:00
parent 9cbaf47e14
commit adb635b5ca
11 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ceilometer/tests/agentbase.py
View File

@ -310,7 +310,7 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
def test_setup_polling_tasks(self):
polling_tasks = self.mgr.setup_polling_tasks()
self.assertEqual(1, len(polling_tasks))
self.assertTrue(60 in polling_tasks.keys())
self.assertIn(60, polling_tasks.keys())
per_task_resources = polling_tasks[60].resources
self.assertEqual(1, len(per_task_resources))
self.assertEqual(set(self.pipeline_cfg[0]['resources']),
@ -332,8 +332,8 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
self.setup_pipeline()
polling_tasks = self.mgr.setup_polling_tasks()
self.assertEqual(2, len(polling_tasks))
self.assertTrue(60 in polling_tasks.keys())
self.assertTrue(10 in polling_tasks.keys())
self.assertIn(60, polling_tasks.keys())
self.assertIn(10, polling_tasks.keys())
def test_setup_polling_tasks_mismatch_counter(self):
self.pipeline_cfg.append(
@ -347,7 +347,7 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
})
polling_tasks = self.mgr.setup_polling_tasks()
self.assertEqual(1, len(polling_tasks))
self.assertTrue(60 in polling_tasks.keys())
self.assertIn(60, polling_tasks.keys())
def test_setup_polling_task_same_interval(self):
self.pipeline_cfg.append({
@ -594,7 +594,7 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
self.setup_pipeline()
polling_tasks = self.mgr.setup_polling_tasks()
self.assertEqual(1, len(polling_tasks))
self.assertTrue(60 in polling_tasks.keys())
self.assertIn(60, polling_tasks.keys())
self.mgr.interval_task(polling_tasks.get(60))
self.assertEqual([None], self.Discovery.params)
self.assertEqual([None], self.DiscoveryAnother.params)
@ -618,11 +618,11 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
published = pipe_line.publishers[0].samples[0]
published_resources = published.resource_metadata['resources']
self.assertEqual(3, len(published_resources))
self.assertTrue(published_resources[0] in expected_pipelines)
self.assertIn(published_resources[0], expected_pipelines)
self.assertEqual(expected_pipelines[published_resources[0]],
pipe_line.name)
for published_resource in published_resources:
self.assertTrue(published_resource in all_resources)
self.assertIn(published_resource, all_resources)
sunk_resources.extend(published_resources)
self.assertEqual(all_resources, set(sunk_resources))
@ -650,7 +650,7 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
self.setup_pipeline()
polling_tasks = self.mgr.setup_polling_tasks()
self.assertEqual(1, len(polling_tasks))
self.assertTrue(60 in polling_tasks.keys())
self.assertIn(60, polling_tasks.keys())
self.mgr.interval_task(polling_tasks.get(60))
self.assertEqual(1, len(self.Pollster.samples))
self.assertEqual(['discovered_1', 'discovered_2'],
@ -677,7 +677,7 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
self.setup_pipeline()
polling_tasks = self.mgr.setup_polling_tasks()
self.assertEqual(1, len(polling_tasks))
self.assertTrue(60 in polling_tasks.keys())
self.assertIn(60, polling_tasks.keys())
self.mgr.interval_task(polling_tasks.get(60))
self.assertEqual(1, len(self.Pollster.samples))
self.assertEqual(['discovered_1', 'discovered_2'],

4
ceilometer/tests/alarm/partition/test_coordination.py
View File

@ -174,11 +174,11 @@ class TestCoordinate(tests_base.BaseTestCase):
for call in calls:
args, _ = call
target, alarms = args
self.assertTrue(target in uneffected)
self.assertIn(target, uneffected)
uneffected.remove(target)
self.assertEqual(per_worker, len(alarms))
for aid in alarms:
self.assertTrue(aid in remainder)
self.assertIn(aid, remainder)
remainder.remove(aid)
self.assertEqual(set(expect_uneffected), set(uneffected))
return remainder

4
ceilometer/tests/api/v2/test_alarm_scenarios.py
View File

@ -1752,8 +1752,8 @@ class TestAlarms(v2.FunctionalTest,
actual = jsonutils.dumps(jsonutils.loads(actual), sort_keys=True)
for k, v in six.iteritems(expected):
fragment = jsonutils.dumps({k: v}, sort_keys=True)[1:-1]
self.assertTrue(fragment in actual,
'%s not in %s' % (fragment, actual))
self.assertIn(fragment, actual,
'%s not in %s' % (fragment, actual))
def test_record_alarm_history_config(self):
self.CONF.set_override('record_history', False, group='alarm')

8
ceilometer/tests/api/v2/test_event_scenarios.py
View File

@ -71,7 +71,7 @@ class TestEventTypeAPI(EventTestBase):
def test_event_types(self):
data = self.get_json(self.PATH, headers=headers)
for event_type in ['Foo', 'Bar', 'Zoo']:
self.assertTrue(event_type in data)
self.assertIn(event_type, data)
class TestTraitAPI(EventTestBase):
@ -141,13 +141,13 @@ class TestEventAPI(EventTestBase):
expected_generated = timeutils.strtime(
at=timeutils.normalize_time(trait_time),
fmt=timeutils._ISO8601_TIME_FORMAT)
self.assertTrue(event['event_type'] in ['Foo', 'Bar', 'Zoo'])
self.assertIn(event['event_type'], ['Foo', 'Bar', 'Zoo'])
self.assertEqual(4, len(event['traits']))
self.assertEqual(expected_generated, event['generated'])
for trait_name in ['trait_A', 'trait_B',
'trait_C', 'trait_D']:
self.assertTrue(trait_name in map(lambda x: x['name'],
event['traits']))
self.assertIn(trait_name, map(lambda x: x['name'],
event['traits']))
trait_time += datetime.timedelta(days=1)
def test_get_event_by_message_id(self):

4
ceilometer/tests/api/v2/test_list_resources_scenarios.py
View File

@ -43,9 +43,9 @@ class TestListResources(v2.FunctionalTest,
def _verify_resource_timestamps(self, res, first, last):
# Bounds need not be tight (see ceilometer bug #1288372)
self.assertTrue('first_sample_timestamp' in res)
self.assertIn('first_sample_timestamp', res)
self.assertTrue(self._isotime(first) >= res['first_sample_timestamp'])
self.assertTrue('last_sample_timestamp' in res)
self.assertIn('last_sample_timestamp', res)
self.assertTrue(self._isotime(last) <= res['last_sample_timestamp'])
def test_instance_no_metadata(self):

2
ceilometer/tests/api/v2/test_statistics_scenarios.py
View File

@ -1554,7 +1554,7 @@ class TestSelectableAggregates(v2.FunctionalTest,
'aggregate.param': 'injection_attack'}
resp = self.get_json(self.PATH, status=[400],
groupby=['project_id'], **agg_args)
self.assertTrue('error_message' in resp)
self.assertIn('error_message', resp)
self.assertEqual(resp['error_message'].get('faultcode'),
'Client')
self.assertEqual(resp['error_message'].get('faultstring'),

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

@ -100,7 +100,7 @@ class TestVsphereInspection(base.BaseTestCase):
def query_stat_side_effect(vm_moid, counter_id, duration):
# assert inputs
self.assertEqual(test_vm_moid, vm_moid)
self.assertTrue(counter_id in counter_id_to_stats_map)
self.assertIn(counter_id, counter_id_to_stats_map)
return counter_id_to_stats_map[counter_id]
# configure vsphere operations mock with the test data
@ -144,7 +144,7 @@ class TestVsphereInspection(base.BaseTestCase):
def query_stat_side_effect(vm_moid, counter_id, duration):
# assert inputs
self.assertEqual(test_vm_moid, vm_moid)
self.assertTrue(counter_id in counter_id_to_stats_map)
self.assertIn(counter_id, counter_id_to_stats_map)
return counter_id_to_stats_map[counter_id]
# configure vsphere operations mock with the test data

8
ceilometer/tests/ipmi/platform/test_ipmi_sensor.py
View File

@ -35,7 +35,7 @@ class TestIPMISensor(base.BaseTestCase):
sensors = self.ipmi.read_sensor_any('Temperature')
# only temperature data returned.
self.assertTrue('Temperature' in sensors)
self.assertIn('Temperature', sensors)
self.assertEqual(1, len(sensors))
# 4 sensor data in total, ignore 1 without 'Sensor Reading'.
@ -48,7 +48,7 @@ class TestIPMISensor(base.BaseTestCase):
sensors = self.ipmi.read_sensor_any('Voltage')
# only voltage data returned.
self.assertTrue('Voltage' in sensors)
self.assertIn('Voltage', sensors)
self.assertEqual(1, len(sensors))
# 4 sensor data in total, ignore 1 without 'Sensor Reading'.
@ -61,7 +61,7 @@ class TestIPMISensor(base.BaseTestCase):
sensors = self.ipmi.read_sensor_any('Current')
# only Current data returned.
self.assertTrue('Current' in sensors)
self.assertIn('Current', sensors)
self.assertEqual(1, len(sensors))
# 2 sensor data in total.
@ -74,7 +74,7 @@ class TestIPMISensor(base.BaseTestCase):
sensors = self.ipmi.read_sensor_any('Fan')
# only Fan data returned.
self.assertTrue('Fan' in sensors)
self.assertIn('Fan', sensors)
self.assertEqual(1, len(sensors))
# 2 sensor data in total.

2
ceilometer/tests/objectstore/test_swift.py
View File

@ -122,7 +122,7 @@ class TestSwiftPollster(testscenarios.testcase.WithScenarios,
data = list(self.pollster._iter_accounts(mock.Mock(), cache,
ASSIGNED_TENANTS))
self.assertTrue(self.pollster.CACHE_KEY_METHOD in cache)
self.assertIn(self.pollster.CACHE_KEY_METHOD, cache)
self.assertEqual([], data)
def test_iter_accounts_cached(self):

4
ceilometer/tests/publisher/test_file.py
View File

@ -106,8 +106,8 @@ class TestFilePublisher(base.BaseTestCase):
with open(name, 'r') as f:
content = f.read()
for sample_item in self.test_data:
self.assertTrue(sample_item.id in content)
self.assertTrue(sample_item.timestamp in content)
self.assertIn(sample_item.id, content)
self.assertIn(sample_item.timestamp, content)
def test_file_publisher_invalid(self):
# Test invalid max bytes, backup count configurations

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

@ -3009,9 +3009,9 @@ class GetEventTest(EventTestBase):
self.event_conn.get_event_types()]
self.assertEqual(3, len(event_types))
self.assertTrue("Bar" in event_types)
self.assertTrue("Foo" in event_types)
self.assertTrue("Zoo" in event_types)
self.assertIn("Bar", event_types)
self.assertIn("Foo", event_types)
self.assertIn("Zoo", event_types)
def test_get_trait_types(self):
trait_types = [tt for tt in
@ -3035,13 +3035,13 @@ class GetEventTest(EventTestBase):
for trait in traits:
trait_dict[trait.name] = trait.dtype
self.assertTrue("trait_A" in trait_dict)
self.assertIn("trait_A", trait_dict)
self.assertEqual(event_models.Trait.TEXT_TYPE, trait_dict["trait_A"])
self.assertTrue("trait_B" in trait_dict)
self.assertIn("trait_B", trait_dict)
self.assertEqual(event_models.Trait.INT_TYPE, trait_dict["trait_B"])
self.assertTrue("trait_C" in trait_dict)
self.assertIn("trait_C", trait_dict)
self.assertEqual(event_models.Trait.FLOAT_TYPE, trait_dict["trait_C"])
self.assertTrue("trait_D" in trait_dict)
self.assertIn("trait_D", trait_dict)
self.assertEqual(event_models.Trait.DATETIME_TYPE,
trait_dict["trait_D"])