summaryrefslogtreecommitdiff
path: root/troveclient/tests
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-11-26 02:17:17 +0000
committerGerrit Code Review <review@openstack.org>2020-11-26 02:17:17 +0000
commit8b892239dcc012d833ea4fb95d4bfd7db6ae7869 (patch)
tree095c49a019226da7166cfc49711336dfa1557e6a /troveclient/tests
parente43454f4b066a0c9a3feaa4ad0bec19564b7596f (diff)
parent3647805c673d0124d72c01ad1eef2478825514fe (diff)
downloadpython-troveclient-6.0.0.tar.gz
Merge "Revert "Fix resize flavor for instance""6.0.0
Diffstat (limited to 'troveclient/tests')
-rw-r--r--troveclient/tests/osc/v1/test_database_instances.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/troveclient/tests/osc/v1/test_database_instances.py b/troveclient/tests/osc/v1/test_database_instances.py
index 62c9a25..38893bd 100644
--- a/troveclient/tests/osc/v1/test_database_instances.py
+++ b/troveclient/tests/osc/v1/test_database_instances.py
@@ -410,14 +410,15 @@ class TestDatabaseInstanceResizeFlavor(TestInstances):
@mock.patch.object(utils, 'find_resource')
def test_instance_resize_flavor(self, mock_find):
args = ['instance1', 'flavor_id']
- mock_find.return_value = 'fake_instance_id'
-
+ mock_find.side_effect = [
+ mock.MagicMock(id='fake_instance_id'),
+ mock.MagicMock(id='fake_flavor_id')
+ ]
parsed_args = self.check_parser(self.cmd, args, [])
- result = self.cmd.take_action(parsed_args)
+ self.cmd.take_action(parsed_args)
self.instance_client.resize_instance.assert_called_with(
- 'fake_instance_id', 'flavor_id')
- self.assertIsNone(result)
+ 'fake_instance_id', 'fake_flavor_id')
class TestDatabaseInstanceUpgrade(TestInstances):