Skip to content

Commit 30fc2df

Browse files
committed
Fix batching tests
1 parent 69c4fa1 commit 30fc2df

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

graphene_sqlalchemy/tests/test_batching.py

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ def resolve_reporters(self, info):
7575
pytest.skip('SQL batching only works for SQLAlchemy 1.2+', allow_module_level=True)
7676

7777

78-
def test_many_to_one(session_factory):
78+
@pytest.mark.asyncio
79+
async def test_many_to_one(session_factory):
7980
session = session_factory()
8081

8182
reporter_1 = Reporter(
@@ -103,7 +104,7 @@ def test_many_to_one(session_factory):
103104
with mock_sqlalchemy_logging_handler() as sqlalchemy_logging_handler:
104105
# Starts new session to fully reset the engine / connection logging level
105106
session = session_factory()
106-
result = schema.execute("""
107+
result = await schema.execute_async("""
107108
query {
108109
articles {
109110
headline
@@ -166,7 +167,8 @@ def test_many_to_one(session_factory):
166167
}
167168

168169

169-
def test_one_to_one(session_factory):
170+
@pytest.mark.asyncio
171+
async def test_one_to_one(session_factory):
170172
session = session_factory()
171173

172174
reporter_1 = Reporter(
@@ -194,7 +196,7 @@ def test_one_to_one(session_factory):
194196
with mock_sqlalchemy_logging_handler() as sqlalchemy_logging_handler:
195197
# Starts new session to fully reset the engine / connection logging level
196198
session = session_factory()
197-
result = schema.execute("""
199+
result = await schema.execute_async("""
198200
query {
199201
reporters {
200202
firstName
@@ -257,7 +259,8 @@ def test_one_to_one(session_factory):
257259
}
258260

259261

260-
def test_one_to_many(session_factory):
262+
@pytest.mark.asyncio
263+
async def test_one_to_many(session_factory):
261264
session = session_factory()
262265

263266
reporter_1 = Reporter(
@@ -293,7 +296,7 @@ def test_one_to_many(session_factory):
293296
with mock_sqlalchemy_logging_handler() as sqlalchemy_logging_handler:
294297
# Starts new session to fully reset the engine / connection logging level
295298
session = session_factory()
296-
result = schema.execute("""
299+
result = await schema.execute_async("""
297300
query {
298301
reporters {
299302
firstName
@@ -382,7 +385,8 @@ def test_one_to_many(session_factory):
382385
}
383386

384387

385-
def test_many_to_many(session_factory):
388+
@pytest.mark.asyncio
389+
async def test_many_to_many(session_factory):
386390
session = session_factory()
387391

388392
reporter_1 = Reporter(
@@ -420,7 +424,7 @@ def test_many_to_many(session_factory):
420424
with mock_sqlalchemy_logging_handler() as sqlalchemy_logging_handler:
421425
# Starts new session to fully reset the engine / connection logging level
422426
session = session_factory()
423-
result = schema.execute("""
427+
result = await schema.execute_async("""
424428
query {
425429
reporters {
426430
firstName
@@ -586,7 +590,8 @@ def resolve_reporters(self, info):
586590
assert len(select_statements) == 2
587591

588592

589-
def test_connection_factory_field_overrides_batching_is_false(session_factory):
593+
@pytest.mark.asyncio
594+
async def test_connection_factory_field_overrides_batching_is_false(session_factory):
590595
session = session_factory()
591596
reporter_1 = Reporter(first_name='Reporter_1')
592597
session.add(reporter_1)
@@ -620,7 +625,7 @@ def resolve_reporters(self, info):
620625
with mock_sqlalchemy_logging_handler() as sqlalchemy_logging_handler:
621626
# Starts new session to fully reset the engine / connection logging level
622627
session = session_factory()
623-
schema.execute("""
628+
await schema.execute_async("""
624629
query {
625630
reporters {
626631
articles {

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
# To keep things simple, we only support newer versions of Graphene
1616
"graphene>=3.0.0b7",
1717
"promise>=2.3",
18-
"SQLAlchemy>=1.1,<2.0",
18+
"SQLAlchemy>=1.1,<1.4",
1919
"aiodataloader>=0.2.0,<1.0",
2020
]
2121

2222
tests_require = [
2323
"pytest>=6.2.0,<7.0",
24+
"pytest-asyncio>=0.15.1",
2425
"pytest-cov>=2.11.0,<3.0",
2526
"sqlalchemy_utils>=0.37.0,<1.0",
2627
"pytest-benchmark>=3.4.0,<4.0",

0 commit comments

Comments
 (0)