Merge "tests: Update fake image client in tests"
This commit is contained in:
commit
811add8b58
@ -22,11 +22,11 @@ from openstackclient.tests.unit import utils
|
|||||||
from openstackclient.tests.unit.volume.v1 import fakes as volume_fakes
|
from openstackclient.tests.unit.volume.v1 import fakes as volume_fakes
|
||||||
|
|
||||||
|
|
||||||
class FakeImagev1Client(object):
|
class FakeImagev1Client:
|
||||||
|
|
||||||
def __init__(self, **kwargs):
|
def __init__(self, **kwargs):
|
||||||
self.images = mock.Mock()
|
self.images = mock.Mock()
|
||||||
self.images.resource_class = fakes.FakeResource(None, {})
|
|
||||||
self.auth_token = kwargs['token']
|
self.auth_token = kwargs['token']
|
||||||
self.management_url = kwargs['endpoint']
|
self.management_url = kwargs['endpoint']
|
||||||
self.version = 1.0
|
self.version = 1.0
|
||||||
@ -35,7 +35,7 @@ class FakeImagev1Client(object):
|
|||||||
class TestImagev1(utils.TestCommand):
|
class TestImagev1(utils.TestCommand):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestImagev1, self).setUp()
|
super().setUp()
|
||||||
|
|
||||||
self.app.client_manager.image = FakeImagev1Client(
|
self.app.client_manager.image = FakeImagev1Client(
|
||||||
endpoint=fakes.AUTH_URL,
|
endpoint=fakes.AUTH_URL,
|
||||||
@ -46,6 +46,8 @@ class TestImagev1(utils.TestCommand):
|
|||||||
token=fakes.AUTH_TOKEN,
|
token=fakes.AUTH_TOKEN,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
self.client = self.app.client_manager.image
|
||||||
|
|
||||||
|
|
||||||
def create_one_image(attrs=None):
|
def create_one_image(attrs=None):
|
||||||
"""Create a fake image.
|
"""Create a fake image.
|
||||||
|
@ -25,11 +25,7 @@ from openstackclient.tests.unit.image.v1 import fakes as image_fakes
|
|||||||
|
|
||||||
class TestImage(image_fakes.TestImagev1):
|
class TestImage(image_fakes.TestImagev1):
|
||||||
|
|
||||||
def setUp(self):
|
pass
|
||||||
super(TestImage, self).setUp()
|
|
||||||
|
|
||||||
self.app.client_manager.image = mock.Mock()
|
|
||||||
self.client = self.app.client_manager.image
|
|
||||||
|
|
||||||
|
|
||||||
class TestImageCreate(TestImage):
|
class TestImageCreate(TestImage):
|
||||||
|
@ -24,21 +24,26 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
|
|||||||
from openstackclient.tests.unit import utils
|
from openstackclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
class FakeImagev2Client(object):
|
class FakeImagev2Client:
|
||||||
|
|
||||||
def __init__(self, **kwargs):
|
def __init__(self, **kwargs):
|
||||||
self.images = mock.Mock()
|
self.images = mock.Mock()
|
||||||
self.images.resource_class = fakes.FakeResource(None, {})
|
self.create_image = mock.Mock()
|
||||||
self.image_members = mock.Mock()
|
self.delete_image = mock.Mock()
|
||||||
self.image_members.resource_class = fakes.FakeResource(None, {})
|
self.update_image = mock.Mock()
|
||||||
self.image_tags = mock.Mock()
|
|
||||||
self.image_tags.resource_class = fakes.FakeResource(None, {})
|
|
||||||
|
|
||||||
self.find_image = mock.Mock()
|
self.find_image = mock.Mock()
|
||||||
self.find_image.resource_class = fakes.FakeResource(None, {})
|
|
||||||
|
|
||||||
self.get_image = mock.Mock()
|
self.get_image = mock.Mock()
|
||||||
self.get_image.resource_class = fakes.FakeResource(None, {})
|
self.download_image = mock.Mock()
|
||||||
|
self.reactivate_image = mock.Mock()
|
||||||
|
self.deactivate_image = mock.Mock()
|
||||||
|
|
||||||
|
self.members = mock.Mock()
|
||||||
|
self.add_member = mock.Mock()
|
||||||
|
self.remove_member = mock.Mock()
|
||||||
|
self.update_member = mock.Mock()
|
||||||
|
|
||||||
|
self.remove_tag = mock.Mock()
|
||||||
|
|
||||||
self.auth_token = kwargs['token']
|
self.auth_token = kwargs['token']
|
||||||
self.management_url = kwargs['endpoint']
|
self.management_url = kwargs['endpoint']
|
||||||
self.version = 2.0
|
self.version = 2.0
|
||||||
@ -47,7 +52,7 @@ class FakeImagev2Client(object):
|
|||||||
class TestImagev2(utils.TestCommand):
|
class TestImagev2(utils.TestCommand):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestImagev2, self).setUp()
|
super().setUp()
|
||||||
|
|
||||||
self.app.client_manager.image = FakeImagev2Client(
|
self.app.client_manager.image = FakeImagev2Client(
|
||||||
endpoint=fakes.AUTH_URL,
|
endpoint=fakes.AUTH_URL,
|
||||||
|
@ -32,18 +32,9 @@ class TestImage(image_fakes.TestImagev2):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestImage, self).setUp()
|
super(TestImage, self).setUp()
|
||||||
|
|
||||||
# Get shortcuts to the Mocks in image client
|
# Get shortcuts to mocked image client
|
||||||
# SDK proxy mock
|
|
||||||
self.app.client_manager.image = mock.Mock()
|
|
||||||
self.client = self.app.client_manager.image
|
self.client = self.app.client_manager.image
|
||||||
|
|
||||||
self.client.remove_member = mock.Mock()
|
|
||||||
|
|
||||||
self.client.create_image = mock.Mock()
|
|
||||||
self.client.update_image = mock.Mock()
|
|
||||||
self.image_members_mock = self.app.client_manager.image.image_members
|
|
||||||
self.image_tags_mock = self.app.client_manager.image.image_tags
|
|
||||||
|
|
||||||
# Get shortcut to the Mocks in identity client
|
# Get shortcut to the Mocks in identity client
|
||||||
self.project_mock = self.app.client_manager.identity.projects
|
self.project_mock = self.app.client_manager.identity.projects
|
||||||
self.project_mock.reset_mock()
|
self.project_mock.reset_mock()
|
||||||
@ -483,11 +474,7 @@ class TestImageList(TestImage):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestImageList, self).setUp()
|
super(TestImageList, self).setUp()
|
||||||
|
|
||||||
self.api_mock = mock.Mock()
|
self.client.images.side_effect = [[self._image], []]
|
||||||
self.api_mock.side_effect = [
|
|
||||||
[self._image], [],
|
|
||||||
]
|
|
||||||
self.client.images = self.api_mock
|
|
||||||
|
|
||||||
# Get the command object to test
|
# Get the command object to test
|
||||||
self.cmd = image.ListImage(self.app, None)
|
self.cmd = image.ListImage(self.app, None)
|
||||||
@ -1003,8 +990,10 @@ class TestImageSet(TestImage):
|
|||||||
result = self.cmd.take_action(parsed_args)
|
result = self.cmd.take_action(parsed_args)
|
||||||
|
|
||||||
self.assertIsNone(result)
|
self.assertIsNone(result)
|
||||||
|
# we'll have called this but not set anything
|
||||||
self.image_members_mock.update.assert_not_called()
|
self.app.client_manager.image.update_image.called_once_with(
|
||||||
|
self._image.id,
|
||||||
|
)
|
||||||
|
|
||||||
def test_image_set_membership_option_accept(self):
|
def test_image_set_membership_option_accept(self):
|
||||||
membership = image_fakes.create_one_image_member(
|
membership = image_fakes.create_one_image_member(
|
||||||
|
Loading…
Reference in New Issue
Block a user