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
parent 5b83e892bd 2eb1902b14
commit 87753afeb2
1 changed files with 20 additions and 9 deletions
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' datastore_version.manager = 'mysql'
mock_get_datastore_version.return_value = (Mock(), datastore_version) mock_get_datastore_version.return_value = (Mock(), datastore_version)
self.assertRaises(exception.ClusterDatastoreNotSupported, self.assertRaisesRegexp(exception.ClusterDatastoreNotSupported,
self.controller.create, "Clusters not supported for",
req, self.controller.create,
body, req,
tenant_id) body,
tenant_id)
@patch.object(Cluster, 'create') @patch.object(Cluster, 'create')
@patch.object(utils, 'get_id_from_href') @patch.object(utils, 'get_id_from_href')
@@ -297,8 +298,12 @@ class TestClusterControllerWithStrategy(trove_testtools.TestCase):
datastore_version.manager = 'redis' datastore_version.manager = 'redis'
mock_get_datastore_version.return_value = (Mock(), datastore_version) mock_get_datastore_version.return_value = (Mock(), datastore_version)
self.assertRaises(exception.TroveError, self.controller.create, req, self.assertRaisesRegexp(exception.TroveError,
body, tenant_id) "Clusters not supported for",
self.controller.create,
req,
body,
tenant_id)
@patch.object(views.ClusterView, 'data', return_value={}) @patch.object(views.ClusterView, 'data', return_value={})
@patch.object(datastore_models, 'get_datastore_version') @patch.object(datastore_models, 'get_datastore_version')
@@ -344,8 +349,14 @@ class TestClusterControllerWithStrategy(trove_testtools.TestCase):
cluster.datastore_version.manager = 'redis' cluster.datastore_version.manager = 'redis'
mock_cluster_load.return_value = cluster mock_cluster_load.return_value = cluster
self.assertRaises(exception.TroveError, self.controller.action, req, self.assertRaisesRegexp(exception.TroveError,
body, tenant_id, id) "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(strategy, 'load_api_strategy')
@patch.object(models.Cluster, 'load') @patch.object(models.Cluster, 'load')