mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-14 11:57:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use mock from standard library (#11588)

Browse source 
Instead of the backported version.
This commit is contained in:
V02460 2021-12-20 16:34:46 +01:00 committed by GitHub
parent 8ad39438fa
commit 7a7ca8f226
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/11588.removal Normal file
View file

@ -0,0 +1 @@
Replace `mock` package by its standard library version.

4
setup.py
View file

@ -120,9 +120,7 @@ CONDITIONAL_REQUIREMENTS["mypy"] = [
# Tests assume that all optional dependencies are installed.
#
# parameterized_class decorator was introduced in parameterized 0.7.0
#
# We use `mock` library as that backports `AsyncMock` to Python 3.6
CONDITIONAL_REQUIREMENTS["test"] = ["parameterized>=0.7.0", "mock>=4.0.0"]
CONDITIONAL_REQUIREMENTS["test"] = ["parameterized>=0.7.0"]
CONDITIONAL_REQUIREMENTS["dev"] = (
CONDITIONAL_REQUIREMENTS["lint"]

17
tests/storage/test_background_update.py
View file

@ -12,15 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Use backported mock for AsyncMock support on Python 3.6.
from mock import Mock
from unittest.mock import Mock
from twisted.internet.defer import Deferred, ensureDeferred
from synapse.storage.background_updates import BackgroundUpdater
from tests import unittest
from tests.test_utils import make_awaitable
from tests.test_utils import make_awaitable, simple_async_mock
class BackgroundUpdateTestCase(unittest.HomeserverTestCase):
@ -116,14 +115,14 @@ class BackgroundUpdateControllerTestCase(unittest.HomeserverTestCase):
)
# Mock out the AsyncContextManager
self._update_ctx_manager = Mock(spec=["__aenter__", "__aexit__"])
self._update_ctx_manager.__aenter__ = Mock(
return_value=make_awaitable(None),
)
self._update_ctx_manager.__aexit__ = Mock(return_value=make_awaitable(None))
class MockCM:
__aenter__ = simple_async_mock(return_value=None)
__aexit__ = simple_async_mock(return_value=None)
self._update_ctx_manager = MockCM
# Mock out the `update_handler` callback
self._on_update = Mock(return_value=self._update_ctx_manager)
self._on_update = Mock(return_value=self._update_ctx_manager())
# Define a default batch size value that's not the same as the internal default
# value (100).