forked from pool/python-amqpstorm
Dirk Mueller
0e23435139
- Update to 2.10.4 * Fixed a potential deadlock when opening a channel with a broken connection [#97] * Added support for custom Message implementations * Added Pagination and Filtering support to Management list calls * Updated to use pytest framework instead of nose for testing. * Fixed bug with UriConnection not handling amqps:// properly. * Fixed bad socket fd causing high cpu usage [#110] - Get new pamqp3.patch from https://github.com/eandersson/amqpstorm/pull/95, which should be in v3 (which is somehow not tagged yet) * rebased it to the new codestream - Do not require mock * mock.patch - Update to 2.8.4 OBS-URL: https://build.opensuse.org/request/show/975670 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-amqpstorm?expand=0&rev=29
108 lines
3.9 KiB
Diff
108 lines
3.9 KiB
Diff
Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/basic/test_basic.py
|
|
===================================================================
|
|
--- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/basic/test_basic.py
|
|
+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/basic/test_basic.py
|
|
@@ -3,7 +3,7 @@ import random
|
|
import string
|
|
import sys
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
from pamqp import commands
|
|
from pamqp.body import ContentBody
|
|
from pamqp.header import ContentHeader
|
|
Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel.py
|
|
===================================================================
|
|
--- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel/test_channel.py
|
|
+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel.py
|
|
@@ -1,4 +1,4 @@
|
|
-import mock
|
|
+from unittest import mock
|
|
from pamqp import commands
|
|
|
|
from amqpstorm import Channel
|
|
Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_exception.py
|
|
===================================================================
|
|
--- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel/test_channel_exception.py
|
|
+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_exception.py
|
|
@@ -1,4 +1,4 @@
|
|
-import mock
|
|
+from unittest import mock
|
|
from pamqp import commands
|
|
|
|
import amqpstorm
|
|
Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_frame.py
|
|
===================================================================
|
|
--- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel/test_channel_frame.py
|
|
+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_frame.py
|
|
@@ -1,4 +1,4 @@
|
|
-import mock
|
|
+from unittest import mock
|
|
from pamqp.header import ContentHeader
|
|
from pamqp import commands
|
|
from pamqp.body import ContentBody
|
|
Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_message_handling.py
|
|
===================================================================
|
|
--- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/channel/test_channel_message_handling.py
|
|
+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/channel/test_channel_message_handling.py
|
|
@@ -1,6 +1,6 @@
|
|
import threading
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
from pamqp.header import ContentHeader
|
|
from pamqp import commands
|
|
from pamqp.body import ContentBody
|
|
Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/connection/test_connection.py
|
|
===================================================================
|
|
--- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/connection/test_connection.py
|
|
+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/connection/test_connection.py
|
|
@@ -1,7 +1,7 @@
|
|
import socket
|
|
import threading
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
from pamqp import exceptions as pamqp_exception
|
|
from pamqp import frame as pamqp_frame
|
|
from pamqp import commands
|
|
Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/io/test_io.py
|
|
===================================================================
|
|
--- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/io/test_io.py
|
|
+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/io/test_io.py
|
|
@@ -1,7 +1,7 @@
|
|
import socket
|
|
import ssl
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
|
|
import amqpstorm.io
|
|
from amqpstorm.exception import AMQPConnectionError
|
|
Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/io/test_io_exception.py
|
|
===================================================================
|
|
--- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/io/test_io_exception.py
|
|
+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/io/test_io_exception.py
|
|
@@ -3,7 +3,7 @@ import socket
|
|
from errno import EINTR
|
|
from errno import EWOULDBLOCK
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
|
|
from amqpstorm import AMQPConnectionError
|
|
from amqpstorm import compatibility
|
|
Index: AMQPStorm-2.10.4/amqpstorm/tests/unit/test_rpc.py
|
|
===================================================================
|
|
--- AMQPStorm-2.10.4.orig/amqpstorm/tests/unit/test_rpc.py
|
|
+++ AMQPStorm-2.10.4/amqpstorm/tests/unit/test_rpc.py
|
|
@@ -1,7 +1,7 @@
|
|
import threading
|
|
import time
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
|
|
from amqpstorm.exception import AMQPChannelError
|
|
from amqpstorm.rpc import Rpc
|