89ef050b8c
Now that we no longer support py27, we can use the standard library
unittest.mock module instead of the third party mock lib. Most of this
is autogenerated, as described below, but there is one manual change
necessary:
nova/tests/functional/regressions/test_bug_1781286.py
We need to avoid using 'fixtures.MockPatch' since fixtures is using
'mock' (the library) under the hood and a call to 'mock.patch.stop'
found in that test will now "stop" mocks from the wrong library. We
have discussed making this configurable but the option proposed isn't
that pretty [1] so this is better.
The remainder was auto-generated with the following (hacky) script, with
one or two manual tweaks after the fact:
import glob
for path in glob.glob('nova/tests/**/*.py', recursive=True):
with open(path) as fh:
lines = fh.readlines()
if 'import mock\n' not in lines:
continue
import_group_found = False
create_first_party_group = False
for num, line in enumerate(lines):
line = line.strip()
if line.startswith('import ') or line.startswith('from '):
tokens = line.split()
for lib in (
'ddt', 'six', 'webob', 'fixtures', 'testtools'
'neutron', 'cinder', 'ironic', 'keystone', 'oslo',
):
if lib in tokens[1]:
create_first_party_group = True
break
if create_first_party_group:
break
import_group_found = True
if not import_group_found:
continue
if line.startswith('import ') or line.startswith('from '):
tokens = line.split()
if tokens[1] > 'unittest':
break
elif tokens[1] == 'unittest' and (
len(tokens) == 2 or tokens[4] > 'mock'
):
break
elif not line:
break
if create_first_party_group:
lines.insert(num, 'from unittest import mock\n\n')
else:
lines.insert(num, 'from unittest import mock\n')
del lines[lines.index('import mock\n')]
with open(path, 'w+') as fh:
fh.writelines(lines)
Note that we cannot remove mock from our requirements files yet due to
importing pypowervm unit test code in nova unit tests. This library
still uses the mock lib, and since we are importing test code and that
lib (correctly) only declares mock in its test-requirements.txt, mock
would not otherwise be installed and would cause errors while loading
nova unit test code.
[1] https://github.com/testing-cabal/fixtures/pull/49
Change-Id: Id5b04cf2f6ca24af8e366d23f15cf0e5cac8e1cc
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
171 lines
6.5 KiB
Python
171 lines
6.5 KiB
Python
# All Rights Reserved.
|
|
#
|
|
# 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 copy
|
|
from unittest import mock
|
|
|
|
from nova import test
|
|
from nova.tests import json_ref
|
|
|
|
|
|
class TestJsonRef(test.NoDBTestCase):
|
|
|
|
def test_update_dict_recursively(self):
|
|
input = {'foo': 1,
|
|
'bar': 13,
|
|
'a list': [],
|
|
'nesting': {
|
|
'baz': 42,
|
|
'foobar': 121
|
|
}}
|
|
|
|
d = copy.deepcopy(input)
|
|
json_ref._update_dict_recursively(d, {})
|
|
self.assertDictEqual(input, d)
|
|
|
|
d = copy.deepcopy(input)
|
|
json_ref._update_dict_recursively(d, {'foo': 111,
|
|
'new_key': 1,
|
|
'nesting': {
|
|
'baz': 142,
|
|
'new_nested': 1
|
|
}})
|
|
expected = copy.deepcopy(input)
|
|
expected['foo'] = 111
|
|
expected['new_key'] = 1
|
|
expected['nesting']['baz'] = 142
|
|
expected['nesting']['new_nested'] = 1
|
|
self.assertDictEqual(expected, d)
|
|
|
|
d = copy.deepcopy(input)
|
|
json_ref._update_dict_recursively(d, {'nesting': 1})
|
|
expected = copy.deepcopy(input)
|
|
expected['nesting'] = 1
|
|
self.assertDictEqual(expected, d)
|
|
d = copy.deepcopy(input)
|
|
|
|
@mock.patch('oslo_serialization.jsonutils.load')
|
|
@mock.patch('builtins.open', new_callable=mock.mock_open())
|
|
def test_resolve_ref(self, mock_open, mock_json_load):
|
|
mock_json_load.return_value = {'baz': 13}
|
|
|
|
actual = json_ref.resolve_refs(
|
|
{'foo': 1,
|
|
'bar': {'$ref': 'another.json#'}},
|
|
'some/base/path/')
|
|
|
|
self.assertDictEqual({'foo': 1,
|
|
'bar': {'baz': 13}},
|
|
actual)
|
|
mock_open.assert_called_once_with('some/base/path/another.json', 'r+b')
|
|
|
|
@mock.patch('oslo_serialization.jsonutils.load')
|
|
@mock.patch('builtins.open', new_callable=mock.mock_open())
|
|
def test_resolve_ref_recursively(self, mock_open, mock_json_load):
|
|
mock_json_load.side_effect = [
|
|
# this is the content of direct_ref.json
|
|
{'baz': 13,
|
|
'nesting': {'$ref': 'subdir/nested_ref.json#'}},
|
|
# this is the content of subdir/nested_ref.json
|
|
{'a deep key': 'happiness'}]
|
|
|
|
actual = json_ref.resolve_refs(
|
|
{'foo': 1,
|
|
'bar': {'$ref': 'direct_ref.json#'}},
|
|
'some/base/path/')
|
|
|
|
self.assertDictEqual({'foo': 1,
|
|
'bar': {'baz': 13,
|
|
'nesting':
|
|
{'a deep key': 'happiness'}}},
|
|
actual)
|
|
mock_open.assert_any_call('some/base/path/direct_ref.json', 'r+b')
|
|
mock_open.assert_any_call('some/base/path/subdir/nested_ref.json',
|
|
'r+b')
|
|
|
|
@mock.patch('oslo_serialization.jsonutils.load')
|
|
@mock.patch('builtins.open', new_callable=mock.mock_open())
|
|
def test_resolve_ref_with_override(self, mock_open, mock_json_load):
|
|
mock_json_load.return_value = {'baz': 13,
|
|
'boo': 42}
|
|
|
|
actual = json_ref.resolve_refs(
|
|
{'foo': 1,
|
|
'bar': {'$ref': 'another.json#',
|
|
'boo': 0}},
|
|
'some/base/path/')
|
|
|
|
self.assertDictEqual({'foo': 1,
|
|
'bar': {'baz': 13,
|
|
'boo': 0}},
|
|
actual)
|
|
mock_open.assert_called_once_with('some/base/path/another.json', 'r+b')
|
|
|
|
@mock.patch('oslo_serialization.jsonutils.load')
|
|
@mock.patch('builtins.open', new_callable=mock.mock_open())
|
|
def test_resolve_ref_with_nested_override(self, mock_open, mock_json_load):
|
|
mock_json_load.return_value = {'baz': 13,
|
|
'boo': {'a': 1,
|
|
'b': 2}}
|
|
|
|
actual = json_ref.resolve_refs(
|
|
{'foo': 1,
|
|
'bar': {'$ref': 'another.json#',
|
|
'boo': {'b': 3,
|
|
'c': 13}}},
|
|
'some/base/path/')
|
|
|
|
self.assertDictEqual({'foo': 1,
|
|
'bar': {'baz': 13,
|
|
'boo': {'a': 1,
|
|
'b': 3,
|
|
'c': 13}}},
|
|
actual)
|
|
mock_open.assert_called_once_with('some/base/path/another.json', 'r+b')
|
|
|
|
@mock.patch('oslo_serialization.jsonutils.load')
|
|
@mock.patch('builtins.open', new_callable=mock.mock_open())
|
|
def test_resolve_ref_with_override_having_refs(self, mock_open,
|
|
mock_json_load):
|
|
mock_json_load.side_effect = [
|
|
{'baz': 13,
|
|
'boo': 42},
|
|
{'something': 0}]
|
|
|
|
actual = json_ref.resolve_refs(
|
|
{'foo': 1,
|
|
'bar': {'$ref': 'another.json#',
|
|
'boo': {'$ref': 'override_ref.json#'}}},
|
|
'some/base/path/')
|
|
|
|
self.assertDictEqual({'foo': 1,
|
|
'bar': {'baz': 13,
|
|
'boo': {'something': 0}}},
|
|
actual)
|
|
self.assertEqual(2, mock_open.call_count)
|
|
# any_order=True is needed as context manager calls also done on open
|
|
mock_open.assert_has_calls(
|
|
[mock.call('some/base/path/another.json', 'r+b'),
|
|
mock.call('some/base/path/override_ref.json', 'r+b')],
|
|
any_order=True)
|
|
|
|
def test_ref_with_json_path_not_supported(self):
|
|
|
|
self.assertRaises(
|
|
NotImplementedError, json_ref.resolve_refs,
|
|
{'foo': 1,
|
|
'bar': {'$ref': 'another.json#/key-in-another',
|
|
'boo': {'b': 3,
|
|
'c': 13}}},
|
|
'some/base/path/')
|