3cba09e767
[breakage related to os-client-config 1.28.0] os-client-config 1.28.0 add a check if filebased and envvars are both used. This check causes OSC unit test failure. OSC now instantiates OpenStackConfig twice as a workaround. The unit test mocks _load_config_file() and it returns a config dict, but os-client-config OpenStackConfig.__init__ updates the dict returned. As a result, when OpenStackConfig is instantiated second time, the mock of _load_config_file returns a modified version of the config dict. This hits the new check in os-client-config 1.28.0. This commit changes the mock to use side_effect rather than return_value to ensure the original dict is used. [breakage related to osc-lib 1.7.0] The change in osc-lib 1.7.0 added "if" logic to avoid calling get() twice. In tests.unit.volume.test_find_resource, kwargs is empty dict in find_resource(), so the second call to get() is NOT called now. Removing the second elements of side_effect addresses the unit failure. Co-Authored-By: Rui Chen <chenrui.momo@gmail.com> Change-Id: Ib9d14661b2755bbd6619e15c0d9023fbc9d27d70 Closes-Bug: #1703782 Closes-Bug: #1703783
82 lines
2.7 KiB
Python
82 lines
2.7 KiB
Python
# Copyright 2013 Nebula Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
import mock
|
|
|
|
from cinderclient.v1 import volume_snapshots
|
|
from cinderclient.v1 import volumes
|
|
from osc_lib import exceptions
|
|
from osc_lib import utils
|
|
|
|
from openstackclient.tests.unit import utils as test_utils
|
|
from openstackclient.volume import client # noqa
|
|
|
|
|
|
# Monkey patch for v1 cinderclient
|
|
# NOTE(dtroyer): Do here because openstackclient.volume.client
|
|
# doesn't do it until the client object is created now.
|
|
volumes.Volume.NAME_ATTR = 'display_name'
|
|
volume_snapshots.Snapshot.NAME_ATTR = 'display_name'
|
|
|
|
|
|
ID = '1after909'
|
|
NAME = 'PhilSpector'
|
|
|
|
|
|
class TestFindResourceVolumes(test_utils.TestCase):
|
|
|
|
def setUp(self):
|
|
super(TestFindResourceVolumes, self).setUp()
|
|
api = mock.Mock()
|
|
api.client = mock.Mock()
|
|
api.client.get = mock.Mock()
|
|
resp = mock.Mock()
|
|
body = {"volumes": [{"id": ID, 'display_name': NAME}]}
|
|
api.client.get.side_effect = [Exception("Not found"),
|
|
(resp, body)]
|
|
self.manager = volumes.VolumeManager(api)
|
|
|
|
def test_find(self):
|
|
result = utils.find_resource(self.manager, NAME)
|
|
self.assertEqual(ID, result.id)
|
|
self.assertEqual(NAME, result.display_name)
|
|
|
|
def test_not_find(self):
|
|
self.assertRaises(exceptions.CommandError, utils.find_resource,
|
|
self.manager, 'GeorgeMartin')
|
|
|
|
|
|
class TestFindResourceVolumeSnapshots(test_utils.TestCase):
|
|
|
|
def setUp(self):
|
|
super(TestFindResourceVolumeSnapshots, self).setUp()
|
|
api = mock.Mock()
|
|
api.client = mock.Mock()
|
|
api.client.get = mock.Mock()
|
|
resp = mock.Mock()
|
|
body = {"snapshots": [{"id": ID, 'display_name': NAME}]}
|
|
api.client.get.side_effect = [Exception("Not found"),
|
|
(resp, body)]
|
|
self.manager = volume_snapshots.SnapshotManager(api)
|
|
|
|
def test_find(self):
|
|
result = utils.find_resource(self.manager, NAME)
|
|
self.assertEqual(ID, result.id)
|
|
self.assertEqual(NAME, result.display_name)
|
|
|
|
def test_not_find(self):
|
|
self.assertRaises(exceptions.CommandError, utils.find_resource,
|
|
self.manager, 'GeorgeMartin')
|