From 2eb1902b14161d3957320c6da1064aaba5ef843a Mon Sep 17 00:00:00 2001 From: sandrely26 Date: Wed, 7 Oct 2015 12:16:56 -0500 Subject: [PATCH] Fix redis cluster unit test for assertRaisesRegexp The redis cluster unit test was updated to use assertRaisesRegexp rather than assertRaises to ensure that the correct messages are being generated. Closes-Bug: #1491918 Change-Id: I89f0da62df7933786424ce2e96815765a66625aa --- .../cluster/test_cluster_redis_controller.py | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/trove/tests/unittests/cluster/test_cluster_redis_controller.py b/trove/tests/unittests/cluster/test_cluster_redis_controller.py index 363db83eaa..c2a55cb216 100644 --- a/trove/tests/unittests/cluster/test_cluster_redis_controller.py +++ b/trove/tests/unittests/cluster/test_cluster_redis_controller.py @@ -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')