openstack/python-openstackclient
Code Issues Proposed changes

Merge "Use FakeImage class to replace duplicated image info in volume test"

Browse Source
This commit is contained in:
Jenkins
2016-11-10 18:09:07 +00:00
committed by Gerrit Code Review
parent f3d3813522 292608dc08
commit 496dbfc52e
2 changed files with 11 additions and 31 deletions
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, '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_id = "5520dc9e-6f9b-4378-a719-729911c0f407"
type_name = "fake-lvmdriver-1" type_name = "fake-lvmdriver-1"

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

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