openstack/trove
Code Issues Proposed changes

Merge "Fix redis cluster unit test for assertRaisesRegexp"

Browse Source
This commit is contained in:
Jenkins 2015-10-12 04:24:11 +00:00 committed by Gerrit Code Review
commit 87753afeb2
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
trove/tests/unittests/cluster/test_cluster_redis_controller.py
View File

@ -125,11 +125,12 @@ class TestClusterController(trove_testtools.TestCase):
datastore_version.manager = 'mysql'
mock_get_datastore_version.return_value = (Mock(), datastore_version)
self.assertRaises(exception.ClusterDatastoreNotSupported,
self.controller.create,
req,
body,
tenant_id)
self.assertRaisesRegexp(exception.ClusterDatastoreNotSupported,
"Clusters not supported for",
self.controller.create,
req,
body,
tenant_id)
@patch.object(Cluster, 'create')
@patch.object(utils, 'get_id_from_href')
@ -297,8 +298,12 @@ class TestClusterControllerWithStrategy(trove_testtools.TestCase):
datastore_version.manager = 'redis'
mock_get_datastore_version.return_value = (Mock(), datastore_version)
self.assertRaises(exception.TroveError, self.controller.create, req,
body, tenant_id)
self.assertRaisesRegexp(exception.TroveError,
"Clusters not supported for",
self.controller.create,
req,
body,
tenant_id)
@patch.object(views.ClusterView, 'data', return_value={})
@patch.object(datastore_models, 'get_datastore_version')
@ -344,8 +349,14 @@ class TestClusterControllerWithStrategy(trove_testtools.TestCase):
cluster.datastore_version.manager = 'redis'
mock_cluster_load.return_value = cluster
self.assertRaises(exception.TroveError, self.controller.action, req,
body, tenant_id, id)
self.assertRaisesRegexp(exception.TroveError,
"No action 'do_stuff2' supplied " +
"by strategy for manager 'redis'",
self.controller.action,
req,
body,
tenant_id,
id)
@patch.object(strategy, 'load_api_strategy')
@patch.object(models.Cluster, 'load')