diff options
| author | Zuul <zuul@review.opendev.org> | 2023-05-10 20:02:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-05-10 20:02:41 +0000 |
| commit | 82feb96ed324dca8cbf4773bbdf91eb9e33d7b67 (patch) | |
| tree | cd0dac09e6a1b99eb00cf8c311d1ba24e726e7ec | |
| parent | b7219be169a3f58e1d560a32c16316fb0e9563be (diff) | |
| parent | 7d9e167da040d1e30aa2cd25d80aa751635212f2 (diff) | |
| download | ceilometer-stable/yoga.tar.gz | |
Merge "Properly handle 'resource_id' as None for Gnocchi publisher" into stable/yogastable/yoga
| -rw-r--r-- | ceilometer/tests/unit/publisher/test_gnocchi.py | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/ceilometer/tests/unit/publisher/test_gnocchi.py b/ceilometer/tests/unit/publisher/test_gnocchi.py index 68d07a14..b048d240 100644 --- a/ceilometer/tests/unit/publisher/test_gnocchi.py +++ b/ceilometer/tests/unit/publisher/test_gnocchi.py @@ -375,18 +375,30 @@ class PublisherTest(base.BaseTestCase): @mock.patch('ceilometer.publisher.gnocchi.GnocchiPublisher' '.batch_measures') def test_unhandled_meter_with_no_resource_id(self, fake_batch): - samples = [sample.Sample( - name='unknown.meter', - unit='GB', - type=sample.TYPE_GAUGE, - volume=2, - user_id='test_user', - project_id='test_project', - source='openstack', - timestamp='2014-05-08 20:23:48.028195', - resource_id=None, - resource_metadata={} - )] + samples = [ + sample.Sample( + name='unknown.meter', + unit='GB', + type=sample.TYPE_GAUGE, + volume=2, + user_id='test_user', + project_id='test_project', + source='openstack', + timestamp='2014-05-08 20:23:48.028195', + resource_id=None, + resource_metadata={}), + sample.Sample( + name='unknown.meter', + unit='GB', + type=sample.TYPE_GAUGE, + volume=2, + user_id='test_user', + project_id='test_project', + source='openstack', + timestamp='2014-05-08 20:23:48.028195', + resource_id="Some-other-resource-id", + resource_metadata={}) + ] url = netutils.urlsplit("gnocchi://") d = gnocchi.GnocchiPublisher(self.conf.conf, url) d._already_checked_archive_policies = True |