]> git.ipfire.org Git - thirdparty/psycopg.git/commitdiff
Make sure tests can run without installing psycopg_pool
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>
Sun, 12 Sep 2021 00:26:02 +0000 (02:26 +0200)
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>
Sun, 12 Sep 2021 00:26:02 +0000 (02:26 +0200)
tests/pool/test_pool.py
tests/pool/test_pool_async.py
tests/pool/test_sched.py
tests/pool/test_sched_async.py

index 010e9483f95f164c1747adfaacbd757d5893f878..5700d458cb9190708f83708fe1e36011bcd04eac 100644 (file)
@@ -8,9 +8,17 @@ from collections import Counter
 import pytest
 
 import psycopg
-import psycopg_pool as pool
 from psycopg.pq import TransactionStatus
 
+pytestmark = []
+
+try:
+    from psycopg_pool import ConnectionPool  # noqa: F401
+except ImportError as ex:
+    pytestmark.append(pytest.mark.skip(reason=str(ex)))
+else:
+    import psycopg_pool as pool
+
 
 def test_defaults(dsn):
     with pool.ConnectionPool(dsn) as p:
index 84befc0201f32d59d487b4a48518c457b48bcf45..efeb73fc8af2019d428776bb8466d891e2d3dcb0 100644 (file)
@@ -7,7 +7,6 @@ from collections import Counter
 import pytest
 
 import psycopg
-import psycopg_pool as pool
 from psycopg.pq import TransactionStatus
 from psycopg._compat import create_task
 
@@ -19,6 +18,13 @@ pytestmark = [
     ),
 ]
 
+try:
+    from psycopg_pool import AsyncConnectionPool  # noqa: F401
+except ImportError as ex:
+    pytestmark.append(pytest.mark.skip(reason=str(ex)))
+else:
+    import psycopg_pool as pool
+
 
 async def test_defaults(dsn):
     async with pool.AsyncConnectionPool(dsn) as p:
index fefef8212147d389fe1488ed61747585bba080d5..d35332fec8812dd2d595bdc9a9751d09c5fec7f5 100644 (file)
@@ -5,9 +5,12 @@ from threading import Thread
 
 import pytest
 
-from psycopg_pool.sched import Scheduler
+pytestmark = [pytest.mark.timing]
 
-pytestmark = pytest.mark.timing
+try:
+    from psycopg_pool.sched import Scheduler
+except ImportError as ex:
+    pytestmark.append(pytest.mark.skip(reason=str(ex)))
 
 
 @pytest.mark.slow
index 57aec74e7fe979d6c62edf60651faf70822b4b2f..2ea36dd1a310dc7670d5238aac4b1cbd90868ade 100644 (file)
@@ -6,10 +6,14 @@ from functools import partial
 import pytest
 
 from psycopg._compat import create_task
-from psycopg_pool.sched import AsyncScheduler
 
 pytestmark = [pytest.mark.asyncio, pytest.mark.timing]
 
+try:
+    from psycopg_pool.sched import AsyncScheduler
+except ImportError as ex:
+    pytestmark.append(pytest.mark.skip(reason=str(ex)))
+
 
 @pytest.mark.slow
 async def test_sched():