diff options
Diffstat (limited to 'troveclient/tests/osc/v1/test_database_instances.py')
| -rw-r--r-- | troveclient/tests/osc/v1/test_database_instances.py | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/troveclient/tests/osc/v1/test_database_instances.py b/troveclient/tests/osc/v1/test_database_instances.py index 9adeae8..e1ea493 100644 --- a/troveclient/tests/osc/v1/test_database_instances.py +++ b/troveclient/tests/osc/v1/test_database_instances.py @@ -14,6 +14,7 @@ import mock from osc_lib import exceptions from osc_lib import utils +from oslo_utils import uuidutils from troveclient import common from troveclient.osc.v1 import database_instances @@ -119,25 +120,44 @@ class TestDatabaseInstanceDelete(TestInstances): super(TestDatabaseInstanceDelete, self).setUp() self.cmd = database_instances.DeleteDatabaseInstance(self.app, None) - @mock.patch.object(utils, 'find_resource') - def test_instance_delete(self, mock_find): + @mock.patch("troveclient.utils.get_resource_id_by_name") + def test_instance_delete(self, mock_getid): + mock_getid.return_value = "fake_uuid" + args = ['instance1'] - mock_find.return_value = args[0] parsed_args = self.check_parser(self.cmd, args, []) - result = self.cmd.take_action(parsed_args) - self.instance_client.delete.assert_called_with('instance1') - self.assertIsNone(result) + self.cmd.take_action(parsed_args) + + mock_getid.assert_called_once_with(self.instance_client, "instance1") + self.instance_client.delete.assert_called_with('fake_uuid') + + @mock.patch("troveclient.utils.get_resource_id_by_name") + def test_instance_delete_with_exception(self, mock_getid): + mock_getid.side_effect = exceptions.CommandError - @mock.patch.object(utils, 'find_resource') - def test_instance_delete_with_exception(self, mock_find): args = ['fakeinstance'] parsed_args = self.check_parser(self.cmd, args, []) - mock_find.side_effect = exceptions.CommandError self.assertRaises(exceptions.CommandError, self.cmd.take_action, parsed_args) + @mock.patch("troveclient.utils.get_resource_id_by_name") + def test_instance_bulk_delete(self, mock_getid): + instance_1 = uuidutils.generate_uuid() + instance_2 = uuidutils.generate_uuid() + mock_getid.return_value = instance_1 + + args = ["fake_instance", instance_2] + parsed_args = self.check_parser(self.cmd, args, []) + self.cmd.take_action(parsed_args) + + mock_getid.assert_called_once_with(self.instance_client, + "fake_instance") + + calls = [mock.call(instance_1), mock.call(instance_2)] + self.instance_client.delete.assert_has_calls(calls) + class TestDatabaseInstanceCreate(TestInstances): |