openstack/aodh
Code Issues Proposed changes

Merge "Utilizes assertIsNone and assertIsNotNone"

Browse Source
This commit is contained in:
Jenkins 2014-01-08 06:17:10 +00:00 committed by Gerrit Code Review
commit dff0102633
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,7 +395,7 @@ class TestCoordinate(test.BaseTestCase):
# Test when the partition to be recorded is the same as the oldest. # Test when the partition to be recorded is the same as the oldest.
self.partition_coordinator._record_oldest( self.partition_coordinator._record_oldest(
self.partition_coordinator.oldest, True) self.partition_coordinator.oldest, True)
self.assertEqual(self.partition_coordinator.oldest, None) self.assertIsNone(self.partition_coordinator.oldest)
def test_check_mastership(self): def test_check_mastership(self):
# Test the method exception condition. # Test the method exception condition.

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

@ -977,7 +977,7 @@ class TestAlarms(FunctionalTest,
def _assert_is_subset(self, expected, actual): def _assert_is_subset(self, expected, actual):
for k, v in expected.iteritems(): for k, v in expected.iteritems():
self.assertEqual(v, actual.get(k), 'mismatched field: %s' % k) self.assertEqual(v, actual.get(k), 'mismatched field: %s' % k)
self.assertTrue(actual['event_id'] is not None) self.assertIsNotNone(actual['event_id'])
def _assert_in_json(self, expected, actual): def _assert_in_json(self, expected, actual):
for k, v in expected.iteritems(): for k, v in expected.iteritems():

4
ceilometer/tests/compute/pollsters/test_location_metadata.py
View File

@ -101,5 +101,5 @@ class TestLocationMetadata(test.BaseTestCase):
self.INSTANCE_PROPERTIES['image'] = '' self.INSTANCE_PROPERTIES['image'] = ''
self.instance = FauxInstance(**self.INSTANCE_PROPERTIES) self.instance = FauxInstance(**self.INSTANCE_PROPERTIES)
md = util._get_metadata_from_object(self.instance) md = util._get_metadata_from_object(self.instance)
self.assertEqual(md['image_ref'], None) self.assertIsNone(md['image_ref'])
self.assertEqual(md['image_ref_url'], None) self.assertIsNone(md['image_ref_url'])

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

@ -179,7 +179,7 @@ class TestLibvirtInspection(test.BaseTestCase):
vnic2, info2 = interfaces[2] vnic2, info2 = interfaces[2]
self.assertEqual(vnic2.name, 'vnet2') self.assertEqual(vnic2.name, 'vnet2')
self.assertEqual(vnic2.mac, 'fa:16:3e:96:33:f0') self.assertEqual(vnic2.mac, 'fa:16:3e:96:33:f0')
self.assertEqual(vnic2.fref, None) self.assertIsNone(vnic2.fref)
self.assertEqual(vnic2.parameters, dict()) self.assertEqual(vnic2.parameters, dict())
self.assertEqual(info2.rx_bytes, 9L) self.assertEqual(info2.rx_bytes, 9L)
self.assertEqual(info2.rx_packets, 10L) self.assertEqual(info2.rx_packets, 10L)

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

@ -92,7 +92,7 @@ NOTIFICATION_DELETE = {"message_id": "0c65cb9c-018c-11e2-bc91-5453ed1bbb5f",
class TestNotification(test.BaseTestCase): class TestNotification(test.BaseTestCase):
def _verify_common_counter(self, c, name, volume): def _verify_common_counter(self, c, name, volume):
self.assertFalse(c is None) self.assertIsNotNone(c)
self.assertEqual(c.name, name) self.assertEqual(c.name, name)
self.assertEqual(c.resource_id, fake_uuid('c')) self.assertEqual(c.resource_id, fake_uuid('c'))
self.assertEqual(c.timestamp, NOW) self.assertEqual(c.timestamp, NOW)

8
ceilometer/tests/objectstore/test_swift_middleware.py
View File

@ -185,7 +185,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
self.assertEqual(data.volume, 28) self.assertEqual(data.volume, 28)
self.assertEqual(data.resource_metadata['version'], '1.0') self.assertEqual(data.resource_metadata['version'], '1.0')
self.assertEqual(data.resource_metadata['container'], 'container') self.assertEqual(data.resource_metadata['container'], 'container')
self.assertEqual(data.resource_metadata['object'], None) self.assertIsNone(data.resource_metadata['object'])
def test_no_metadata_headers(self): def test_no_metadata_headers(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(), {}) app = swift_middleware.CeilometerMiddleware(FakeApp(), {})
@ -200,7 +200,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
self.assertEqual(len(http_headers), 0) self.assertEqual(len(http_headers), 0)
self.assertEqual(data.resource_metadata['version'], '1.0') self.assertEqual(data.resource_metadata['version'], '1.0')
self.assertEqual(data.resource_metadata['container'], 'container') self.assertEqual(data.resource_metadata['container'], 'container')
self.assertEqual(data.resource_metadata['object'], None) self.assertIsNone(data.resource_metadata['object'])
def test_metadata_headers(self): def test_metadata_headers(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(), { app = swift_middleware.CeilometerMiddleware(FakeApp(), {
@ -219,7 +219,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
self.assertEqual(len(http_headers), 2) self.assertEqual(len(http_headers), 2)
self.assertEqual(data.resource_metadata['version'], '1.0') self.assertEqual(data.resource_metadata['version'], '1.0')
self.assertEqual(data.resource_metadata['container'], 'container') self.assertEqual(data.resource_metadata['container'], 'container')
self.assertEqual(data.resource_metadata['object'], None) self.assertIsNone(data.resource_metadata['object'])
self.assertEqual(data.resource_metadata['http_header_x_var1'], self.assertEqual(data.resource_metadata['http_header_x_var1'],
'value1') 'value1')
self.assertEqual(data.resource_metadata['http_header_x_var2'], self.assertEqual(data.resource_metadata['http_header_x_var2'],
@ -241,7 +241,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
self.assertEqual(len(http_headers), 0) self.assertEqual(len(http_headers), 0)
self.assertEqual(data.resource_metadata['version'], '1.0') self.assertEqual(data.resource_metadata['version'], '1.0')
self.assertEqual(data.resource_metadata['container'], 'container') self.assertEqual(data.resource_metadata['container'], 'container')
self.assertEqual(data.resource_metadata['object'], None) self.assertIsNone(data.resource_metadata['object'])
def test_bogus_path(self): def test_bogus_path(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(), {}) app = swift_middleware.CeilometerMiddleware(FakeApp(), {})

8
ceilometer/tests/storage/sqlalchemy/test_models.py
View File

@ -71,12 +71,12 @@ class PreciseTimestampTest(test.BaseTestCase):
def test_process_bind_param_store_none_mysql(self): def test_process_bind_param_store_none_mysql(self):
result = self._type.process_bind_param(None, self._mysql_dialect) result = self._type.process_bind_param(None, self._mysql_dialect)
self.assertEqual(result, None) self.assertIsNone(result)
def test_process_bind_param_store_none_postgres(self): def test_process_bind_param_store_none_postgres(self):
result = self._type.process_bind_param(None, result = self._type.process_bind_param(None,
self._postgres_dialect) self._postgres_dialect)
self.assertEqual(result, None) self.assertIsNone(result)
def test_process_result_value_datetime_mysql(self): def test_process_result_value_datetime_mysql(self):
dec_value = utils.dt_to_decimal(self._date) dec_value = utils.dt_to_decimal(self._date)
@ -92,9 +92,9 @@ class PreciseTimestampTest(test.BaseTestCase):
def test_process_result_value_none_mysql(self): def test_process_result_value_none_mysql(self):
result = self._type.process_result_value(None, result = self._type.process_result_value(None,
self._mysql_dialect) self._mysql_dialect)
self.assertEqual(result, None) self.assertIsNone(result)
def test_process_result_value_none_postgres(self): def test_process_result_value_none_postgres(self):
result = self._type.process_result_value(None, result = self._type.process_result_value(None,
self._postgres_dialect) self._postgres_dialect)
self.assertEqual(result, None) self.assertIsNone(result)

2
ceilometer/tests/test_bin.py
View File

@ -119,7 +119,7 @@ class BinApiTestCase(base.BaseTestCase):
r, c = self.http.request(url, 'GET') r, c = self.http.request(url, 'GET')
except socket.error: except socket.error:
time.sleep(.5) time.sleep(.5)
self.assertEqual(self.subp.poll(), None) self.assertIsNone(self.subp.poll())
else: else:
return r, c return r, c
return (None, None) return (None, None)

2
ceilometer/tests/test_utils.py
View File

@ -83,7 +83,7 @@ class TestUtils(test.BaseTestCase):
self.assertEqual(pairs, expected) self.assertEqual(pairs, expected)
def test_decimal_to_dt_with_none_parameter(self): def test_decimal_to_dt_with_none_parameter(self):
self.assertEqual(utils.decimal_to_dt(None), None) self.assertIsNone(utils.decimal_to_dt(None))
def test_dict_to_kv(self): def test_dict_to_kv(self):
data = {'a': 'A', data = {'a': 'A',

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

@ -103,7 +103,7 @@ NOTIFICATION_VOLUME_RESIZE = {
class TestNotifications(test.BaseTestCase): class TestNotifications(test.BaseTestCase):
def _verify_common_sample(self, s, name, notification): def _verify_common_sample(self, s, name, notification):
self.assertFalse(s is None) self.assertIsNotNone(s)
self.assertEqual(s.name, name) self.assertEqual(s.name, name)
self.assertEqual(s.resource_id, notification['payload']['volume_id']) self.assertEqual(s.resource_id, notification['payload']['volume_id'])
self.assertEqual(s.timestamp, notification['timestamp']) self.assertEqual(s.timestamp, notification['timestamp'])