Skip to content

Commit 7e4f1bb

Browse files
author
Omer Katz
authored
Fix regression from #2148 (#2165)
* Fix regression from #2148. Fixes #2157. * Fix linter error.
1 parent 2a206a1 commit 7e4f1bb

2 files changed

Lines changed: 21 additions & 2 deletions

File tree

kombu/transport/sqlalchemy/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,14 @@ def _engine_from_config(self):
109109
transport_options = conninfo.transport_options.copy()
110110
transport_options.pop('queue_tablename', None)
111111
transport_options.pop('message_tablename', None)
112+
transport_options.pop('callback', None)
113+
transport_options.pop('errback', None)
114+
transport_options.pop('max_retries', None)
115+
transport_options.pop('interval_start', None)
116+
transport_options.pop('interval_step', None)
117+
transport_options.pop('interval_max', None)
118+
transport_options.pop('retry_errors', None)
119+
112120
return create_engine(conninfo.hostname, **transport_options)
113121

114122
def _open(self):

t/unit/transport/test_sqlalchemy.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
from __future__ import annotations
22

3-
from unittest.mock import patch
3+
from unittest.mock import Mock, patch
44

55
import pytest
66

77
from kombu import Connection
8+
from kombu.exceptions import OperationalError
89

910
pytest.importorskip('sqlalchemy')
1011

@@ -24,7 +25,17 @@ def test_url_parser(self):
2425
Connection(url).connect()
2526

2627
def test_simple_queueing(self):
27-
conn = Connection('sqlalchemy+sqlite:///:memory:')
28+
conn = Connection(
29+
'sqlalchemy+sqlite:///:memory:',
30+
transport_options={
31+
"callback": Mock(),
32+
"errback": Mock(),
33+
"max_retries": 20,
34+
"interval_start": 1,
35+
"interval_step": 2,
36+
"interval_max": 30,
37+
"retry_errors": (OperationalError,)
38+
})
2839
conn.connect()
2940
try:
3041
channel = conn.channel()

0 commit comments

Comments
 (0)