openstack/python-openstackclient
Code Issues Proposed changes

Use FakeImage class to replace duplicated image info in volume test

Browse Source 
FakeImage class has been added in image v1 so that
we can reuse it in volume v1 unit test to replace
the duplicated image info in volume v1 fake.

Change-Id: I0f96e568bd65e59241b57704fc2a379319a386d8
This commit is contained in:
Huanxuan Ao 2016-10-20 14:11:33 +08:00
parent fee1a31296
commit 292608dc08
2 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openstackclient/tests/unit/volume/v1/fakes.py
View File

@ -69,19 +69,6 @@ EXTENSION = {
'links': extension_links,
}
# NOTE(dtroyer): duplicating here the minimum image info needed to test
# volume create --image until circular references can be
# avoided by refactoring the test fakes.
image_id = 'im1'
image_name = 'graven'
IMAGE = {
'id': image_id,
'name': image_name,
}
type_id = "5520dc9e-6f9b-4378-a719-729911c0f407"
type_name = "fake-lvmdriver-1"

29
openstackclient/tests/unit/volume/v1/test_volume.py
View File

@ -14,15 +14,14 @@
#
import argparse
import copy
import mock
from mock import call
from osc_lib import exceptions
from osc_lib import utils
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit.image.v1 import fakes as image_fakes
from openstackclient.tests.unit import utils as tests_utils
from openstackclient.tests.unit.volume.v1 import fakes as volume_fakes
from openstackclient.volume.v1 import volume
@ -321,19 +320,16 @@ class TestVolumeCreate(TestVolume):
self.assertEqual(self.datalist, data)
def test_volume_create_image_id(self):
self.images_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.IMAGE),
loaded=True,
)
image = image_fakes.FakeImage.create_one_image()
self.images_mock.get.return_value = image
arglist = [
'--image', volume_fakes.image_id,
'--image', image.id,
'--size', str(self.new_volume.size),
self.new_volume.display_name,
]
verifylist = [
('image', volume_fakes.image_id),
('image', image.id),
('size', self.new_volume.size),
('name', self.new_volume.display_name),
]
@ -360,26 +356,23 @@ class TestVolumeCreate(TestVolume):
None,
None,
None,
volume_fakes.image_id,
image.id,
)
self.assertEqual(self.columns, columns)
self.assertEqual(self.datalist, data)
def test_volume_create_image_name(self):
self.images_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.IMAGE),
loaded=True,
)
image = image_fakes.FakeImage.create_one_image()
self.images_mock.get.return_value = image
arglist = [
'--image', volume_fakes.image_name,
'--image', image.name,
'--size', str(self.new_volume.size),
self.new_volume.display_name,
]
verifylist = [
('image', volume_fakes.image_name),
('image', image.name),
('size', self.new_volume.size),
('name', self.new_volume.display_name),
]
@ -406,7 +399,7 @@ class TestVolumeCreate(TestVolume):
None,
None,
None,
volume_fakes.image_id,
image.id,
)
self.assertEqual(self.columns, columns)