7594bb0627
Now that we are python3 only, we should move to using the built in version of mock that supports all of our testing needs and remove the dependency on the "mock" package. This patch moves all references to "import mock" to "from unittest import mock". It also cleans up some new line inconsistency. Fixed an inconsistency in the OVSBridge.deferred() definition as it needs to also have an *args argument. Fixed an issue where an l3-agent test was mocking functools.partial, causing a python3.8 failure. Unit tests only, removing from tests/base.py affects functional tests which need additional work. Change-Id: I40e8a8410840c3774c72ae1a8054574445d66ece
35 lines
1.1 KiB
Python
35 lines
1.1 KiB
Python
#
|
|
# 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.
|
|
|
|
from unittest import mock
|
|
|
|
from oslo_concurrency import lockutils
|
|
|
|
from neutron.common import coordination
|
|
from neutron.tests import base
|
|
|
|
|
|
@mock.patch.object(lockutils, 'lock')
|
|
class CoordinationTestCase(base.BaseTestCase):
|
|
def test_synchronized(self, get_lock):
|
|
@coordination.synchronized('lock-{f_name}-{foo.val}-{bar[val]}')
|
|
def func(foo, bar):
|
|
pass
|
|
|
|
foo = mock.Mock()
|
|
foo.val = 7
|
|
bar = mock.MagicMock()
|
|
bar.__getitem__.return_value = 8
|
|
func(foo, bar)
|
|
get_lock.assert_called_with('lock-func-7-8')
|