x/collectd-openstack-plugins
Code Issues Proposed changes

Add collectd_ceilometer/tests/common

Browse Source 
Tests in collectd_ceilometer/tests/common were not being run.

- Added __init__.py so tests in tests/common are detected.
- Resolved errors associated with incorrect references and paths.

Change-Id: I50854588a14724cec83b6665137be565faef3133
Closes-Bug: #1681441
This commit is contained in:
Emma Foley
2017-04-10 14:33:22 +00:00
parent 028725c0ab
commit b055b29f3e
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
collectd_ceilometer/tests/common/__init__.py Normal file
View File

18
collectd_ceilometer/tests/common/test_keystone_light.py
View File

@@ -18,9 +18,9 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from collectd_ceilometer import keystone_light from collectd_ceilometer.common import keystone_light
from collectd_ceilometer.keystone_light import ClientV3 from collectd_ceilometer.common.keystone_light import ClientV3
from collectd_ceilometer.keystone_light import MissingServices from collectd_ceilometer.common.keystone_light import MissingServices
import mock import mock
import unittest import unittest
@@ -99,7 +99,7 @@ class KeystoneLightTestV3(unittest.TestCase):
'X-Subject-Token': "c5bbb1c9a27e470fb482de2a718e08c2" '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): def test_refresh(self, mock_post):
"""Test refresh""" """Test refresh"""
@@ -140,7 +140,7 @@ class KeystoneLightTestV3(unittest.TestCase):
headers=expected_args['headers'], 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): def test_getservice_endpoint(self, mock_post):
"""Test getservice endpoint""" """Test getservice endpoint"""
@@ -163,7 +163,7 @@ class KeystoneLightTestV3(unittest.TestCase):
with self.assertRaises(MissingServices): with self.assertRaises(MissingServices):
client.get_service_endpoint('badname') 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): def test_getservice_endpoint_error(self, mock_post):
"""Test getservice endpoint error""" """Test getservice endpoint error"""
@@ -216,7 +216,7 @@ class KeystoneLightTestV3(unittest.TestCase):
with self.assertRaises(MissingServices): with self.assertRaises(MissingServices):
client.get_service_endpoint('ceilometer') 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): def test_invalidresponse_missing_token(self, mock_post):
"""Test invalid response: missing access""" """Test invalid response: missing access"""
@@ -235,7 +235,7 @@ class KeystoneLightTestV3(unittest.TestCase):
with self.assertRaises(keystone_light.InvalidResponse): with self.assertRaises(keystone_light.InvalidResponse):
client.refresh() 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): def test_invalidresponse_missing_catalog(self, mock_post):
"""Test invalid response: missing catalog""" """Test invalid response: missing catalog"""
@@ -279,7 +279,7 @@ class KeystoneLightTestV3(unittest.TestCase):
with self.assertRaises(keystone_light.InvalidResponse): with self.assertRaises(keystone_light.InvalidResponse):
client.refresh() 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): def test_invalidresponse_missing_token_http_header(self, mock_post):
"""Test invalid response: missing token in header""" """Test invalid response: missing token in header"""

3
collectd_ceilometer/tests/common/test_meters_base.py
View File

@@ -36,7 +36,8 @@ class CollectdMock(object):
def get_dataset(self, string): def get_dataset(self, string):
pass pass
collectd_class = 'collectd_ceilometer.tests.test_meters_base.CollectdMock' collectd_class = \
'collectd_ceilometer.tests.common.test_meters_base.CollectdMock'
class MetersTest(TestCase): class MetersTest(TestCase):

6
releasenotes/notes/bug-1681441-781f29b36935b20b.yaml Normal file
View File

@@ -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.