summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-19 02:48:07 +0000
committerGerrit Code Review <review@openstack.org>2016-08-19 02:48:08 +0000
commit8f63da46216053ef218a11e5809325b09462db6f (patch)
treea18a053dd0347715ff58dbc985b8a3033673fee1 /openstackclient
parent7489fa36aac04dd4185d5e2af16fcacade1f7da9 (diff)
parent95f0e3dc366a94d7e47c5dc4178253c25b1aaa08 (diff)
downloadpython-openstackclient-8f63da46216053ef218a11e5809325b09462db6f.tar.gz
Merge "Fix errors in volume set/unset image properties unit tests"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/tests/volume/v2/test_volume.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/openstackclient/tests/volume/v2/test_volume.py b/openstackclient/tests/volume/v2/test_volume.py
index 1bb5c192..74181a25 100644
--- a/openstackclient/tests/volume/v2/test_volume.py
+++ b/openstackclient/tests/volume/v2/test_volume.py
@@ -841,7 +841,7 @@ class TestVolumeSet(TestVolume):
# returns nothing
self.cmd.take_action(parsed_args)
self.volumes_mock.set_image_metadata.assert_called_with(
- self.volumes_mock.get().id, parsed_args.image_property)
+ self.new_volume.id, parsed_args.image_property)
def test_volume_set_state(self):
arglist = [
@@ -919,7 +919,7 @@ class TestVolumeUnset(TestVolume):
super(TestVolumeUnset, self).setUp()
self.new_volume = volume_fakes.FakeVolume.create_one_volume()
- self.volumes_mock.create.return_value = self.new_volume
+ self.volumes_mock.get.return_value = self.new_volume
# Get the command object to set property
self.cmd_set = volume.SetVolume(self.app, None)
@@ -963,4 +963,4 @@ class TestVolumeUnset(TestVolume):
self.cmd_unset.take_action(parsed_args_unset)
self.volumes_mock.delete_image_metadata.assert_called_with(
- self.volumes_mock.get().id, parsed_args_unset.image_property)
+ self.new_volume.id, parsed_args_unset.image_property)