forked from pool/python-ZEO
Daniel Garcia
29f39368ac
- version update to 5.4.0
* Reimplement and streamline the asyncio part of the ClientStorage implementation.
* Remove support for interoperability with ZEO4 server.
* If the zeopack script cannot connect to a server it sets exit status 1 See #214.
* Remove asyncio/mtacceptor module.
* Add support for Python 3.10, 3.11.
* Add ConflictError to the list of unlogged server exceptions.
- do not require six
- modified patches
% python-ZEO-no-mock.patch (refreshed)
- added patches
fix d0f0709ac6
+ python-ZEO-no-six.patch
OBS-URL: https://build.opensuse.org/request/show/1076889
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZEO?expand=0&rev=28
114 lines
3.2 KiB
Diff
114 lines
3.2 KiB
Diff
Index: ZEO-5.4.0/src/ZEO/tests/testZEO.py
|
|
===================================================================
|
|
--- ZEO-5.4.0.orig/src/ZEO/tests/testZEO.py
|
|
+++ ZEO-5.4.0/src/ZEO/tests/testZEO.py
|
|
@@ -83,7 +83,10 @@ class CreativeGetState(persistent.Persis
|
|
class Test_convenience_functions(unittest.TestCase):
|
|
|
|
def test_ZEO_client_convenience(self):
|
|
- import mock
|
|
+ try:
|
|
+ from unittest import mock as mock
|
|
+ except ImportError:
|
|
+ import mock
|
|
import ZEO
|
|
|
|
client_thread = mock.Mock(
|
|
@@ -95,7 +98,10 @@ class Test_convenience_functions(unittes
|
|
client._cache.close() # client thread responsibility
|
|
|
|
def test_ZEO_DB_convenience_ok(self):
|
|
- import mock
|
|
+ try:
|
|
+ from unittest import mock as mock
|
|
+ except ImportError:
|
|
+ import mock
|
|
import ZEO
|
|
|
|
client_mock = mock.Mock(spec=['close'])
|
|
@@ -113,7 +119,10 @@ class Test_convenience_functions(unittes
|
|
client_mock.close.assert_not_called()
|
|
|
|
def test_ZEO_DB_convenience_error(self):
|
|
- import mock
|
|
+ try:
|
|
+ from unittest import mock as mock
|
|
+ except ImportError:
|
|
+ import mock
|
|
import ZEO
|
|
|
|
client_mock = mock.Mock(spec=['close'])
|
|
@@ -131,7 +140,10 @@ class Test_convenience_functions(unittes
|
|
client_mock.close.assert_called_once()
|
|
|
|
def test_ZEO_connection_convenience_ok(self):
|
|
- import mock
|
|
+ try:
|
|
+ from unittest import mock as mock
|
|
+ except ImportError:
|
|
+ import mock
|
|
import ZEO
|
|
|
|
ret = object()
|
|
@@ -150,7 +162,10 @@ class Test_convenience_functions(unittes
|
|
DB_mock.close.assert_not_called()
|
|
|
|
def test_ZEO_connection_convenience_value(self):
|
|
- import mock
|
|
+ try:
|
|
+ from unittest import mock as mock
|
|
+ except ImportError:
|
|
+ import mock
|
|
import ZEO
|
|
|
|
DB_mock = mock.Mock(spec=[
|
|
Index: ZEO-5.4.0/src/ZEO/tests/testZEOServer.py
|
|
===================================================================
|
|
--- ZEO-5.4.0.orig/src/ZEO/tests/testZEOServer.py
|
|
+++ ZEO-5.4.0/src/ZEO/tests/testZEOServer.py
|
|
@@ -1,6 +1,9 @@
|
|
import unittest
|
|
|
|
-import mock
|
|
+try:
|
|
+ from unittest import mock as mock
|
|
+except ImportError:
|
|
+ import mock
|
|
|
|
from ZEO._compat import PY3
|
|
from ZEO.runzeo import ZEOServer
|
|
Index: ZEO-5.4.0/src/ZEO/tests/testssl.py
|
|
===================================================================
|
|
--- ZEO-5.4.0.orig/src/ZEO/tests/testssl.py
|
|
+++ ZEO-5.4.0/src/ZEO/tests/testssl.py
|
|
@@ -1,9 +1,12 @@
|
|
from .._compat import PY3
|
|
|
|
-import mock
|
|
import os
|
|
import ssl
|
|
import unittest
|
|
+try:
|
|
+ from unittest import mock as mock
|
|
+except ImportError:
|
|
+ import mock
|
|
from ZODB.config import storageFromString
|
|
|
|
from ..Exceptions import ClientDisconnected
|
|
Index: ZEO-5.4.0/src/ZEO/asyncio/tests.py
|
|
===================================================================
|
|
--- ZEO-5.4.0.orig/src/ZEO/asyncio/tests.py
|
|
+++ ZEO-5.4.0/src/ZEO/asyncio/tests.py
|
|
@@ -12,7 +12,10 @@ else:
|
|
|
|
from zope.testing import setupstack
|
|
from unittest import TestCase
|
|
-import mock
|
|
+try:
|
|
+ from unittest import mock as mock
|
|
+except ImportError:
|
|
+ import mock
|
|
from ZODB.utils import maxtid, RLock
|
|
|
|
import collections
|