openstack/python-mistralclient
Code Issues Proposed changes

Merge "Refactor common parts of client tests"

Browse Source
This commit is contained in:
Jenkins
2016-09-26 10:52:12 +00:00
committed by Gerrit Code Review
parent 7cc35c53b6 c07e97351d
commit 249cb60df3
1 changed files with 64 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
mistralclient/tests/unit/test_client.py
View File

@@ -13,13 +13,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import json
import os import os
import tempfile import tempfile
import uuid import uuid
import mock import mock
from oslotest import base from oslotest import base
import osprofiler.profiler import osprofiler.profiler
from mistralclient.api import client from mistralclient.api import client
@@ -34,15 +34,22 @@ PROFILER_HMAC_KEY = 'SECRET_HMAC_KEY'
class BaseClientTests(base.BaseTestCase): class BaseClientTests(base.BaseTestCase):
@mock.patch('keystoneclient.v2_0.client.Client') @staticmethod
def test_mistral_url_from_catalog_v2(self, keystone_client_mock): def setup_keystone_mock(keystone_client_mock):
keystone_client_instance = keystone_client_mock.return_value keystone_client_instance = keystone_client_mock.return_value
keystone_client_instance.auth_token = str(uuid.uuid4()) keystone_client_instance.auth_token = str(uuid.uuid4())
keystone_client_instance.project_id = str(uuid.uuid4()) keystone_client_instance.project_id = str(uuid.uuid4())
keystone_client_instance.user_id = str(uuid.uuid4()) keystone_client_instance.user_id = str(uuid.uuid4())
keystone_client_instance.auth_ref = str(json.dumps({}))
return keystone_client_instance
@mock.patch('keystoneclient.v2_0.client.Client')
def test_mistral_url_from_catalog_v2(self, keystone_client_mock):
keystone_client_instance = self.setup_keystone_mock(
keystone_client_mock
)
url_for = mock.Mock(return_value='http://mistral_host:8989/v2') url_for = mock.Mock(return_value='http://mistral_host:8989/v2')
keystone_client_instance.service_catalog.url_for = url_for keystone_client_instance.service_catalog.url_for = url_for
mistralclient = client.client( mistralclient = client.client(
@@ -59,10 +66,9 @@ class BaseClientTests(base.BaseTestCase):
@mock.patch('keystoneclient.v3.client.Client') @mock.patch('keystoneclient.v3.client.Client')
def test_mistral_url_from_catalog(self, keystone_client_mock): def test_mistral_url_from_catalog(self, keystone_client_mock):
keystone_client_instance = keystone_client_mock.return_value keystone_client_instance = self.setup_keystone_mock(
keystone_client_instance.auth_token = str(uuid.uuid4()) keystone_client_mock
keystone_client_instance.project_id = str(uuid.uuid4()) )
keystone_client_instance.user_id = str(uuid.uuid4())
url_for = mock.Mock(return_value='http://mistral_host:8989/v2') url_for = mock.Mock(return_value='http://mistral_host:8989/v2')
@@ -82,26 +88,13 @@ class BaseClientTests(base.BaseTestCase):
@mock.patch('keystoneclient.v3.client.Client') @mock.patch('keystoneclient.v3.client.Client')
@mock.patch('mistralclient.api.httpclient.HTTPClient') @mock.patch('mistralclient.api.httpclient.HTTPClient')
def test_mistral_url_default(self, mocked, keystone_client_mock): def test_mistral_url_default(self, http_client_mock, keystone_client_mock):
keystone_client_instance = keystone_client_mock.return_value keystone_client_instance = self.setup_keystone_mock(
keystone_client_instance.auth_token = str(uuid.uuid4()) keystone_client_mock
keystone_client_instance.project_id = str(uuid.uuid4())
keystone_client_instance.user_id = str(uuid.uuid4())
url_for = mock.Mock(side_effect=Exception)
keystone_client_instance.service_catalog.url_for = url_for
expected_args = (
MISTRAL_HTTP_URL,
) )
expected_kwargs = { url_for = mock.Mock(side_effect=Exception)
'username': 'mistral', keystone_client_instance.service_catalog.url_for = url_for
'project_name': 'mistral',
'auth_url': AUTH_HTTP_URL_v3,
'auth_token': keystone_client_instance.auth_token,
'project_id': keystone_client_instance.project_id,
'user_id': keystone_client_instance.user_id
}
client.client( client.client(
username='mistral', username='mistral',
@@ -109,36 +102,32 @@ class BaseClientTests(base.BaseTestCase):
auth_url=AUTH_HTTP_URL_v3 auth_url=AUTH_HTTP_URL_v3
) )
self.assertTrue(mocked.called) self.assertTrue(http_client_mock.called)
self.assertEqual(expected_args, mocked.call_args[0]) mistral_url_for_http = http_client_mock.call_args[0][0]
self.assertDictEqual(expected_kwargs, mocked.call_args[1]) kwargs = http_client_mock.call_args[1]
self.assertEqual(MISTRAL_HTTP_URL, mistral_url_for_http)
self.assertEqual(
keystone_client_instance.auth_token, kwargs['auth_token']
)
self.assertEqual(
keystone_client_instance.project_id, kwargs['project_id']
)
self.assertEqual(
keystone_client_instance.user_id, kwargs['user_id']
)
@mock.patch('keystoneclient.v3.client.Client') @mock.patch('keystoneclient.v3.client.Client')
@mock.patch('mistralclient.api.httpclient.HTTPClient') @mock.patch('mistralclient.api.httpclient.HTTPClient')
def test_mistral_url_https_insecure(self, mocked, keystone_client_mock): def test_mistral_url_https_insecure(self, http_client_mock,
keystone_client_instance = keystone_client_mock.return_value keystone_client_mock):
keystone_client_instance.auth_token = str(uuid.uuid4()) keystone_client_instance = self.setup_keystone_mock( # noqa
keystone_client_instance.project_id = str(uuid.uuid4()) keystone_client_mock
keystone_client_instance.user_id = str(uuid.uuid4()) )
url_for = mock.Mock(side_effect=Exception)
keystone_client_instance.service_catalog.url_for = url_for
expected_args = ( expected_args = (
MISTRAL_HTTPS_URL, MISTRAL_HTTPS_URL,
) )
expected_kwargs = {
'mistral_url': MISTRAL_HTTPS_URL,
'username': 'mistral',
'project_name': 'mistral',
'auth_url': AUTH_HTTP_URL_v3,
'cacert': None,
'insecure': True,
'auth_token': keystone_client_instance.auth_token,
'project_id': keystone_client_instance.project_id,
'user_id': keystone_client_instance.user_id
}
client.client( client.client(
mistral_url=MISTRAL_HTTPS_URL, mistral_url=MISTRAL_HTTPS_URL,
username='mistral', username='mistral',
@@ -148,59 +137,46 @@ class BaseClientTests(base.BaseTestCase):
insecure=True insecure=True
) )
self.assertTrue(mocked.called) self.assertTrue(http_client_mock.called)
self.assertEqual(expected_args, mocked.call_args[0]) self.assertEqual(http_client_mock.call_args[0], expected_args)
self.assertDictEqual(expected_kwargs, mocked.call_args[1]) self.assertEqual(http_client_mock.call_args[1]['insecure'], True)
@mock.patch('keystoneclient.v3.client.Client') @mock.patch('keystoneclient.v3.client.Client')
@mock.patch('mistralclient.api.httpclient.HTTPClient') @mock.patch('mistralclient.api.httpclient.HTTPClient')
def test_mistral_url_https_secure(self, mock, keystone_client_mock): def test_mistral_url_https_secure(self, http_client_mock,
fd, path = tempfile.mkstemp(suffix='.pem') keystone_client_mock):
fd, cert_path = tempfile.mkstemp(suffix='.pem')
keystone_client_instance = keystone_client_mock.return_value keystone_client_instance = self.setup_keystone_mock( # noqa
keystone_client_instance.auth_token = str(uuid.uuid4()) keystone_client_mock
keystone_client_instance.project_id = str(uuid.uuid4()) )
keystone_client_instance.user_id = str(uuid.uuid4())
expected_args = ( expected_args = (
MISTRAL_HTTPS_URL, MISTRAL_HTTPS_URL,
) )
expected_kwargs = {
'mistral_url': MISTRAL_HTTPS_URL,
'username': 'mistral',
'project_name': 'mistral',
'auth_url': AUTH_HTTP_URL_v3,
'cacert': path,
'insecure': False,
'auth_token': keystone_client_instance.auth_token,
'project_id': keystone_client_instance.project_id,
'user_id': keystone_client_instance.user_id
}
try: try:
client.client( client.client(
mistral_url=MISTRAL_HTTPS_URL, mistral_url=MISTRAL_HTTPS_URL,
username='mistral', username='mistral',
project_name='mistral', project_name='mistral',
auth_url=AUTH_HTTP_URL_v3, auth_url=AUTH_HTTP_URL_v3,
cacert=path, cacert=cert_path,
insecure=False insecure=False
) )
finally: finally:
os.close(fd) os.close(fd)
os.unlink(path) os.unlink(cert_path)
self.assertTrue(mock.called) self.assertTrue(http_client_mock.called)
self.assertEqual(expected_args, mock.call_args[0]) self.assertEqual(http_client_mock.call_args[0], expected_args)
self.assertDictEqual(expected_kwargs, mock.call_args[1]) self.assertEqual(http_client_mock.call_args[1]['cacert'], cert_path)
@mock.patch('keystoneclient.v3.client.Client') @mock.patch('keystoneclient.v3.client.Client')
def test_mistral_url_https_bad_cacert(self, keystone_client_mock): def test_mistral_url_https_bad_cacert(self, keystone_client_mock):
keystone_client_instance = keystone_client_mock.return_value keystone_client_instance = self.setup_keystone_mock( # noqa
keystone_client_instance.auth_token = str(uuid.uuid4()) keystone_client_mock
keystone_client_instance.project_id = str(uuid.uuid4()) )
keystone_client_instance.user_id = str(uuid.uuid4())
self.assertRaises( self.assertRaises(
ValueError, ValueError,
@@ -219,16 +195,15 @@ class BaseClientTests(base.BaseTestCase):
log_warning_mock): log_warning_mock):
fd, path = tempfile.mkstemp(suffix='.pem') fd, path = tempfile.mkstemp(suffix='.pem')
keystone_client_instance = keystone_client_mock.return_value keystone_client_instance = self.setup_keystone_mock(
keystone_client_instance.auth_token = str(uuid.uuid4()) keystone_client_mock
keystone_client_instance.project_id = str(uuid.uuid4()) )
keystone_client_instance.user_id = str(uuid.uuid4())
try: try:
client.client( client.client(
mistral_url=MISTRAL_HTTPS_URL, mistral_url=MISTRAL_HTTPS_URL,
username='mistral', user_id=keystone_client_instance.user_id,
project_name='mistral', project_id=keystone_client_instance.project_id,
auth_url=AUTH_HTTP_URL_v3, auth_url=AUTH_HTTP_URL_v3,
cacert=path, cacert=path,
insecure=True insecure=True
@@ -241,28 +216,12 @@ class BaseClientTests(base.BaseTestCase):
@mock.patch('keystoneclient.v3.client.Client') @mock.patch('keystoneclient.v3.client.Client')
@mock.patch('mistralclient.api.httpclient.HTTPClient') @mock.patch('mistralclient.api.httpclient.HTTPClient')
def test_mistral_profile_enabled(self, mocked, keystone_client_mock): def test_mistral_profile_enabled(self, http_client_mock,
keystone_client_instance = keystone_client_mock.return_value keystone_client_mock):
keystone_client_instance.auth_token = str(uuid.uuid4()) keystone_client_instance = self.setup_keystone_mock( # noqa
keystone_client_instance.project_id = str(uuid.uuid4()) keystone_client_mock
keystone_client_instance.user_id = str(uuid.uuid4())
url_for = mock.Mock(side_effect=Exception)
keystone_client_instance.service_catalog.url_for = url_for
expected_args = (
MISTRAL_HTTP_URL,
) )
expected_kwargs = {
'username': 'mistral',
'project_name': 'mistral',
'auth_url': AUTH_HTTP_URL_v3,
'profile': PROFILER_HMAC_KEY,
'auth_token': keystone_client_instance.auth_token,
'project_id': keystone_client_instance.project_id,
'user_id': keystone_client_instance.user_id
}
client.client( client.client(
username='mistral', username='mistral',
project_name='mistral', project_name='mistral',
@@ -270,9 +229,7 @@ class BaseClientTests(base.BaseTestCase):
profile=PROFILER_HMAC_KEY profile=PROFILER_HMAC_KEY
) )
self.assertTrue(mocked.called) self.assertTrue(http_client_mock.called)
self.assertEqual(expected_args, mocked.call_args[0])
self.assertDictEqual(expected_kwargs, mocked.call_args[1])
profiler = osprofiler.profiler.get() profiler = osprofiler.profiler.get()