Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Some tests are ignored"

Browse Source
This commit is contained in:
Jenkins
2015-12-15 07:57:58 +00:00
committed by Gerrit Code Review
parent 62570525ad b01f4bead4
commit 7c72d6f912
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
watcher/common/ceilometer.py
View File

@@ -19,6 +19,7 @@
from ceilometerclient import client from ceilometerclient import client
from ceilometerclient.exc import HTTPUnauthorized from ceilometerclient.exc import HTTPUnauthorized
from watcher.common import keystone from watcher.common import keystone

15
watcher/tests/common/ceilometer.py → watcher/tests/common/test_ceilometer.py
View File

@@ -19,10 +19,11 @@ from __future__ import unicode_literals
from mock import MagicMock from mock import MagicMock
from mock import mock from mock import mock
from oslo_config import cfg
from watcher.common.ceilometer import CeilometerClient from watcher.common.ceilometer import CeilometerClient
from watcher.tests.base import BaseTestCase from watcher.tests.base import BaseTestCase
CONF = cfg.CONF
class TestCeilometer(BaseTestCase): class TestCeilometer(BaseTestCase):
@@ -44,8 +45,12 @@ class TestCeilometer(BaseTestCase):
resource_ids=["resource_ids"]) resource_ids=["resource_ids"])
self.assertEqual(query, expected) self.assertEqual(query, expected)
@mock.patch("watcher.common.keystone.Keystoneclient") @mock.patch('keystoneclient.v2_0.client.Client', autospec=True)
def test_get_ceilometer_v2(self, mock_keystone): @mock.patch('ceilometerclient.v2.client.Client', autospec=True)
def test_get_ceilometer_v2(self, mock_keystone, mock_ceilometer):
cfg.CONF.set_override(
'auth_uri', "http://127.0.0.1:9898/v2", group="keystone_authtoken"
)
c = CeilometerClient(api_version='2') c = CeilometerClient(api_version='2')
from ceilometerclient.v2 import Client from ceilometerclient.v2 import Client
self.assertIsInstance(c.cmclient, Client) self.assertIsInstance(c.cmclient, Client)
@@ -77,8 +82,8 @@ class TestCeilometer(BaseTestCase):
@mock.patch.object(CeilometerClient, "cmclient") @mock.patch.object(CeilometerClient, "cmclient")
def test_get_last_sample_none(self, mock_keystone): def test_get_last_sample_none(self, mock_keystone):
expected = False expected = []
mock_keystone.samples.list.return_value = None mock_keystone.samples.list.return_value = expected
val = self.cm.get_last_sample_values( val = self.cm.get_last_sample_values(
resource_id="id", resource_id="id",
meter_name="compute.node.percent" meter_name="compute.node.percent"

19
watcher/tests/common/keystone.py → watcher/tests/common/test_keystone.py
View File

@@ -17,23 +17,26 @@
from __future__ import absolute_import from __future__ import absolute_import
from __future__ import unicode_literals from __future__ import unicode_literals
from keystoneclient.auth.identity import Password from keystoneclient.auth.identity import Password
from keystoneclient.session import Session from keystoneclient.session import Session
from mock import mock from mock import mock
from oslo_config import cfg
from watcher.common.keystone import KeystoneClient from watcher.common.keystone import KeystoneClient
from watcher.tests.base import BaseTestCase from watcher.tests.base import BaseTestCase
CONF = cfg.CONF
class TestKeyStone(BaseTestCase):
class TestKeystone(BaseTestCase):
def setUp(self): def setUp(self):
super(TestKeyStone, self).setUp() super(TestKeystone, self).setUp()
self.ckeystone = KeystoneClient() self.ckeystone = KeystoneClient()
@mock.patch('keystoneclient.client.Client') @mock.patch('keystoneclient.v2_0.client.Client', autospec=True)
def test_get_endpoint(self, keystone): def test_get_endpoint_v2(self, keystone):
expected_endpoint = "http://IP:PORT" expected_endpoint = "http://ip:port/v2"
cfg.CONF.set_override(
'auth_uri', expected_endpoint, group="keystone_authtoken"
)
ks = mock.Mock() ks = mock.Mock()
ks.service_catalog.url_for.return_value = expected_endpoint ks.service_catalog.url_for.return_value = expected_endpoint
keystone.return_value = ks keystone.return_value = ks