diff --git a/collectd_ceilometer/tests/common/__init__.py b/collectd_ceilometer/tests/common/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/collectd_ceilometer/tests/common/test_keystone_light.py b/collectd_ceilometer/tests/common/test_keystone_light.py index 41c7f3d..aed1cf5 100644 --- a/collectd_ceilometer/tests/common/test_keystone_light.py +++ b/collectd_ceilometer/tests/common/test_keystone_light.py @@ -18,9 +18,9 @@ from __future__ import unicode_literals -from collectd_ceilometer import keystone_light -from collectd_ceilometer.keystone_light import ClientV3 -from collectd_ceilometer.keystone_light import MissingServices +from collectd_ceilometer.common import keystone_light +from collectd_ceilometer.common.keystone_light import ClientV3 +from collectd_ceilometer.common.keystone_light import MissingServices import mock import unittest @@ -99,7 +99,7 @@ class KeystoneLightTestV3(unittest.TestCase): 'X-Subject-Token': "c5bbb1c9a27e470fb482de2a718e08c2" } - @mock.patch('collectd_ceilometer.keystone_light.requests.post') + @mock.patch('collectd_ceilometer.common.keystone_light.requests.post') def test_refresh(self, mock_post): """Test refresh""" @@ -140,7 +140,7 @@ class KeystoneLightTestV3(unittest.TestCase): headers=expected_args['headers'], ) - @mock.patch('collectd_ceilometer.keystone_light.requests.post') + @mock.patch('collectd_ceilometer.common.keystone_light.requests.post') def test_getservice_endpoint(self, mock_post): """Test getservice endpoint""" @@ -163,7 +163,7 @@ class KeystoneLightTestV3(unittest.TestCase): with self.assertRaises(MissingServices): client.get_service_endpoint('badname') - @mock.patch('collectd_ceilometer.keystone_light.requests.post') + @mock.patch('collectd_ceilometer.common.keystone_light.requests.post') def test_getservice_endpoint_error(self, mock_post): """Test getservice endpoint error""" @@ -216,7 +216,7 @@ class KeystoneLightTestV3(unittest.TestCase): with self.assertRaises(MissingServices): client.get_service_endpoint('ceilometer') - @mock.patch('collectd_ceilometer.keystone_light.requests.post') + @mock.patch('collectd_ceilometer.common.keystone_light.requests.post') def test_invalidresponse_missing_token(self, mock_post): """Test invalid response: missing access""" @@ -235,7 +235,7 @@ class KeystoneLightTestV3(unittest.TestCase): with self.assertRaises(keystone_light.InvalidResponse): client.refresh() - @mock.patch('collectd_ceilometer.keystone_light.requests.post') + @mock.patch('collectd_ceilometer.common.keystone_light.requests.post') def test_invalidresponse_missing_catalog(self, mock_post): """Test invalid response: missing catalog""" @@ -279,7 +279,7 @@ class KeystoneLightTestV3(unittest.TestCase): with self.assertRaises(keystone_light.InvalidResponse): client.refresh() - @mock.patch('collectd_ceilometer.keystone_light.requests.post') + @mock.patch('collectd_ceilometer.common.keystone_light.requests.post') def test_invalidresponse_missing_token_http_header(self, mock_post): """Test invalid response: missing token in header""" diff --git a/collectd_ceilometer/tests/common/test_meters_base.py b/collectd_ceilometer/tests/common/test_meters_base.py index 0eceafc..bb050fa 100644 --- a/collectd_ceilometer/tests/common/test_meters_base.py +++ b/collectd_ceilometer/tests/common/test_meters_base.py @@ -36,7 +36,8 @@ class CollectdMock(object): def get_dataset(self, string): pass -collectd_class = 'collectd_ceilometer.tests.test_meters_base.CollectdMock' +collectd_class = \ + 'collectd_ceilometer.tests.common.test_meters_base.CollectdMock' class MetersTest(TestCase): diff --git a/releasenotes/notes/bug-1681441-781f29b36935b20b.yaml b/releasenotes/notes/bug-1681441-781f29b36935b20b.yaml new file mode 100644 index 0000000..9717645 --- /dev/null +++ b/releasenotes/notes/bug-1681441-781f29b36935b20b.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes 'bug #1681441 https://bugs.launchpad.net/collectd-ceilometer-plugin/+bug/1681441' + and enables the common tests to run. Tests now run for + common/{keystone_light,logger,meters/base}.py.