diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-08-12 18:42:16 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-08-12 18:42:16 +0000 |
commit | bbc6cba06895ee52f35f7050568ce6619ee15aac (patch) | |
tree | bcd0171c16579a4abc3169298c8b30aa67a41eaa | |
parent | d60937d22faa7c97940a64bd4ca3380ea06aaf7d (diff) | |
parent | f40ba19b75b1ffaf112c8def48ec1a361b32ef86 (diff) | |
download | python-ceilometerclient-bbc6cba06895ee52f35f7050568ce6619ee15aac.tar.gz |
Merge "Replace assertTrue with assertIsNotNone for check an object"
-rw-r--r-- | ceilometerclient/tests/v2/test_alarms.py | 23 | ||||
-rw-r--r-- | ceilometerclient/tests/v2/test_events.py | 4 | ||||
-rw-r--r-- | ceilometerclient/tests/v2/test_resources.py | 4 | ||||
-rw-r--r-- | ceilometerclient/tests/v2/test_samples.py | 2 |
4 files changed, 16 insertions, 17 deletions
diff --git a/ceilometerclient/tests/v2/test_alarms.py b/ceilometerclient/tests/v2/test_alarms.py index f963bce..c3aa6d5 100644 --- a/ceilometerclient/tests/v2/test_alarms.py +++ b/ceilometerclient/tests/v2/test_alarms.py @@ -288,7 +288,7 @@ class AlarmManagerTest(testtools.TestCase): 'GET', '/v2/alarms/alarm-id' ] self.http_client.assert_called(*expect) - self.assertTrue(alarm) + self.assertIsNotNone(alarm) self.assertEqual(alarm.alarm_id, 'alarm-id') self.assertEqual(alarm.rule, alarm.threshold_rule) @@ -298,7 +298,7 @@ class AlarmManagerTest(testtools.TestCase): 'POST', '/v2/alarms' ] self.http_client.assert_called(*expect, body=CREATE_ALARM) - self.assertTrue(alarm) + self.assertIsNotNone(alarm) def test_update(self): alarm = self.mgr.update(alarm_id='alarm-id', **UPDATE_ALARM) @@ -310,7 +310,7 @@ class AlarmManagerTest(testtools.TestCase): ] self.http_client.assert_called(*expect_get, pos=0) self.http_client.assert_called(*expect_put, pos=1) - self.assertTrue(alarm) + self.assertIsNotNone(alarm) self.assertEqual(alarm.alarm_id, 'alarm-id') for (key, value) in six.iteritems(UPDATED_ALARM): self.assertEqual(getattr(alarm, key), value) @@ -325,7 +325,7 @@ class AlarmManagerTest(testtools.TestCase): ] self.http_client.assert_called(*expect_get, pos=0) self.http_client.assert_called(*expect_put, pos=1) - self.assertTrue(alarm) + self.assertIsNotNone(alarm) self.assertEqual(alarm.alarm_id, 'alarm-id') for (key, value) in six.iteritems(UPDATED_ALARM): self.assertEqual(getattr(alarm, key), value) @@ -356,7 +356,7 @@ class AlarmManagerTest(testtools.TestCase): def test_get_from_alarm_class(self): alarm = self.mgr.get(alarm_id='alarm-id') - self.assertTrue(alarm) + self.assertIsNotNone(alarm) alarm.get() expect = [ 'GET', '/v2/alarms/alarm-id' @@ -368,7 +368,7 @@ class AlarmManagerTest(testtools.TestCase): def test_get_state_from_alarm_class(self): alarm = self.mgr.get(alarm_id='alarm-id') - self.assertTrue(alarm) + self.assertIsNotNone(alarm) state = alarm.get_state() expect_get_1 = [ 'GET', '/v2/alarms/alarm-id' @@ -382,7 +382,7 @@ class AlarmManagerTest(testtools.TestCase): def test_delete_from_alarm_class(self): alarm = self.mgr.get(alarm_id='alarm-id') - self.assertTrue(alarm) + self.assertIsNotNone(alarm) deleted = alarm.delete() expect_get = [ 'GET', '/v2/alarms/alarm-id' @@ -428,9 +428,8 @@ class AlarmLegacyManagerTest(testtools.TestCase): expect = [ 'POST', '/v2/alarms', CREATE_ALARM_WITHOUT_TC, ] - self.http_client.assert_called(*expect) - self.assertTrue(alarm) + self.assertIsNotNone(alarm) def test_create_counter_name(self): create = {} @@ -442,7 +441,7 @@ class AlarmLegacyManagerTest(testtools.TestCase): 'POST', '/v2/alarms', CREATE_ALARM_WITHOUT_TC, ] self.http_client.assert_called(*expect) - self.assertTrue(alarm) + self.assertIsNotNone(alarm) def test_update(self): alarm = self.mgr.update(alarm_id='alarm-id', **DELTA_LEGACY_ALARM) @@ -450,7 +449,7 @@ class AlarmLegacyManagerTest(testtools.TestCase): 'PUT', '/v2/alarms/alarm-id', UPDATED_ALARM ] self.http_client.assert_called(*expect_put) - self.assertTrue(alarm) + self.assertIsNotNone(alarm) self.assertEqual(alarm.alarm_id, 'alarm-id') for (key, value) in six.iteritems(UPDATED_ALARM): self.assertEqual(getattr(alarm, key), value) @@ -465,7 +464,7 @@ class AlarmLegacyManagerTest(testtools.TestCase): 'PUT', '/v2/alarms/alarm-id', UPDATED_ALARM ] self.http_client.assert_called(*expect_put) - self.assertTrue(alarm) + self.assertIsNotNone(alarm) self.assertEqual(alarm.alarm_id, 'alarm-id') for (key, value) in six.iteritems(UPDATED_ALARM): self.assertEqual(getattr(alarm, key), value) diff --git a/ceilometerclient/tests/v2/test_events.py b/ceilometerclient/tests/v2/test_events.py index acf27d4..6b1e74b 100644 --- a/ceilometerclient/tests/v2/test_events.py +++ b/ceilometerclient/tests/v2/test_events.py @@ -146,7 +146,7 @@ class EventManagerTest(utils.BaseTestCase): 'GET', '/v2/events/2' ] self.http_client.assert_called(*expect) - self.assertTrue(event) + self.assertIsNotNone(event) self.assertEqual(event.event_type, 'Foo') def test_list_with_query(self): @@ -188,7 +188,7 @@ class EventManagerTest(utils.BaseTestCase): def test_get_from_event_class(self): event = self.mgr.get(2) - self.assertTrue(event) + self.assertIsNotNone(event) event.get() expect = [ 'GET', '/v2/events/2' diff --git a/ceilometerclient/tests/v2/test_resources.py b/ceilometerclient/tests/v2/test_resources.py index 5d53737..090ce8c 100644 --- a/ceilometerclient/tests/v2/test_resources.py +++ b/ceilometerclient/tests/v2/test_resources.py @@ -91,7 +91,7 @@ class ResourceManagerTest(utils.BaseTestCase): 'GET', '/v2/resources/a' ] self.http_client.assert_called(*expect) - self.assertTrue(resource) + self.assertIsNotNone(resource) self.assertEqual(resource.resource_id, 'a') def test_list_by_query(self): @@ -108,7 +108,7 @@ class ResourceManagerTest(utils.BaseTestCase): def test_get_from_resource_class(self): resource = self.mgr.get(resource_id='a') - self.assertTrue(resource) + self.assertIsNotNone(resource) resource.get() expect = [ 'GET', '/v2/resources/a' diff --git a/ceilometerclient/tests/v2/test_samples.py b/ceilometerclient/tests/v2/test_samples.py index 46b4cff..5804c7e 100644 --- a/ceilometerclient/tests/v2/test_samples.py +++ b/ceilometerclient/tests/v2/test_samples.py @@ -104,7 +104,7 @@ class SampleManagerTest(utils.BaseTestCase): 'POST', '/v2/meters/instance' ] self.http_client.assert_called(*expect, body=CREATE_SAMPLE) - self.assertTrue(sample) + self.assertIsNotNone(sample) def test_limit(self): samples = list(self.mgr.list(meter_name='instance', limit=1)) |