diff options
author | Zuul <zuul@review.opendev.org> | 2020-04-09 12:39:12 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2020-04-09 12:39:12 +0000 |
commit | 75b9d4e914804364bb07292c412b1d1cd1459295 (patch) | |
tree | a19727795ccae5cf4083f73ca5208192fc5ff964 | |
parent | 571e1d3c85343911448bbda56676fcd643861d81 (diff) | |
parent | cf86cc3b7ac41f62cf6a359e8e2d97b01542cde0 (diff) | |
download | ceilometer-75b9d4e914804364bb07292c412b1d1cd1459295.tar.gz |
Merge "Temporary failures should be treated as temporary."
-rw-r--r-- | ceilometer/compute/pollsters/__init__.py | 1 | ||||
-rw-r--r-- | ceilometer/tests/unit/compute/pollsters/test_memory.py | 8 | ||||
-rw-r--r-- | ceilometer/tests/unit/compute/pollsters/test_perf.py | 3 |
3 files changed, 0 insertions, 12 deletions
diff --git a/ceilometer/compute/pollsters/__init__.py b/ceilometer/compute/pollsters/__init__.py index d64b15d0..2c32f23c 100644 --- a/ceilometer/compute/pollsters/__init__.py +++ b/ceilometer/compute/pollsters/__init__.py @@ -158,7 +158,6 @@ class GenericComputePollster(plugin_base.PollsterBase): '%(instance_id)s, non-fatal reason: %(exc)s', {'pollster': self.__class__.__name__, 'instance_id': instance.id, 'exc': e}) - raise plugin_base.PollsterPermanentError(resources) except ceilometer.NotImplementedError: # Selected inspector does not implement this pollster. LOG.debug('%(inspector)s does not provide data for ' diff --git a/ceilometer/tests/unit/compute/pollsters/test_memory.py b/ceilometer/tests/unit/compute/pollsters/test_memory.py index 351bfbaf..ddcd29a1 100644 --- a/ceilometer/tests/unit/compute/pollsters/test_memory.py +++ b/ceilometer/tests/unit/compute/pollsters/test_memory.py @@ -18,7 +18,6 @@ from unittest import mock from ceilometer.compute.pollsters import instance_stats from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.polling import manager -from ceilometer.polling import plugin_base from ceilometer.tests.unit.compute.pollsters import base @@ -62,9 +61,6 @@ class TestMemoryPollster(base.TestPollsterBase): def all_samples(): return list(pollster.get_samples(mgr, {}, [self.instance])) - self.assertRaises(plugin_base.PollsterPermanentError, - all_samples) - class TestResidentMemoryPollster(base.TestPollsterBase): @@ -141,8 +137,6 @@ class TestMemorySwapPollster(base.TestPollsterBase): def all_samples(): return list(pollster.get_samples(mgr, {}, [self.instance])) - self.assertRaises(plugin_base.PollsterPermanentError, all_samples) - class TestMemoryBandwidthPollster(base.TestPollsterBase): @@ -184,5 +178,3 @@ class TestMemoryBandwidthPollster(base.TestPollsterBase): def all_samples(): return list(pollster.get_samples(mgr, {}, [self.instance])) - - self.assertRaises(plugin_base.PollsterPermanentError, all_samples) diff --git a/ceilometer/tests/unit/compute/pollsters/test_perf.py b/ceilometer/tests/unit/compute/pollsters/test_perf.py index dc550139..c881becc 100644 --- a/ceilometer/tests/unit/compute/pollsters/test_perf.py +++ b/ceilometer/tests/unit/compute/pollsters/test_perf.py @@ -15,7 +15,6 @@ from ceilometer.compute.pollsters import instance_stats from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.polling import manager -from ceilometer.polling import plugin_base from ceilometer.tests.unit.compute.pollsters import base @@ -80,5 +79,3 @@ class TestPerfPollster(base.TestPollsterBase): def all_samples(): return list(pollster.get_samples(mgr, {}, [self.instance])) - - self.assertRaises(plugin_base.PollsterPermanentError, all_samples) |