test: fix decorator to skip tests on crdb because of any db name accepted

diff --git a/tests/fix_crdb.py b/tests/fix_crdb.py
index afcc6af129b78f42e26262a1055a6e7a0a07bbcb..60d721c2155a28494f34c2159d23617fa3cca04e 100644 (file)
--- a/tests/fix_crdb.py
+++ b/tests/fix_crdb.py
@@ -79,10 +79,6 @@ def crdb_scs_off(*args):
     return skip_crdb(*args, reason="standard_conforming_strings=off")
 
 
-def crdb_anydb(*args):
-    return skip_crdb(*args, reason="can connect to any db name")
-
-
 # mapping from reason description to ticket number
 _crdb_reasons = {
     "2-phase commit": 22329,

diff --git a/tests/pq/test_pgconn.py b/tests/pq/test_pgconn.py
index 4e8c57f8ef80f584f2571190996a3eb43cb508ef..cbe241ea089e969c43de83e8cff1456003d0cbba 100644 (file)
--- a/tests/pq/test_pgconn.py
+++ b/tests/pq/test_pgconn.py
@@ -19,8 +19,6 @@ import psycopg.generators
 from psycopg import pq
 from psycopg.conninfo import make_conninfo
 
-from ..fix_crdb import crdb_anydb
-
 if TYPE_CHECKING:
     from psycopg.pq.abc import PGcancelConn, PGconn
 
@@ -53,7 +51,7 @@ def test_connectdb(dsn):
     assert conn.status == pq.ConnStatus.OK, conn.error_message
 
 
-@crdb_anydb
+@pytest.mark.crdb("skip", reason="can connect to any db name")
 def test_connectdb_error(dsn):
     conn = pq.PGconn.connect(make_conninfo(dsn, dbname="nosuchdb").encode())
     assert conn.status == pq.ConnStatus.BAD

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 25b17119fa9c9b7e5acae551116a81b716dbe7dc..026800e93f3419f932480434a4e7992746d6105d 100644 (file)
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -19,7 +19,6 @@ from psycopg.conninfo import conninfo_to_dict, timeout_from_conninfo
 from psycopg._conninfo_utils import get_param
 
 from .acompat import skip_async, skip_sync, sleep
-from .fix_crdb import crdb_anydb
 from .test_adapt import make_bin_dumper, make_dumper
 from ._test_cursor import my_row_factory
 from ._test_connection import testctx  # noqa: F401  # fixture
@@ -36,7 +35,7 @@ def test_connect(conn_cls, dsn):
     conn.close()
 
 
-@crdb_anydb
+@pytest.mark.crdb("skip", reason="can connect to any db name")
 def test_connect_bad(conn_cls, dsn):
     with pytest.raises(psycopg.OperationalError):
         conn_cls.connect(dsn, dbname="nosuchdb")

diff --git a/tests/test_connection_async.py b/tests/test_connection_async.py
index 080909f694ebb1fbeee76c0369a0a1a962541c73..fe85c00a807928b080b50ca11fa23b10312f3fc9 100644 (file)
--- a/tests/test_connection_async.py
+++ b/tests/test_connection_async.py
@@ -16,7 +16,6 @@ from psycopg.conninfo import conninfo_to_dict, timeout_from_conninfo
 from psycopg._conninfo_utils import get_param
 
 from .acompat import asleep, skip_async, skip_sync
-from .fix_crdb import crdb_anydb
 from .test_adapt import make_bin_dumper, make_dumper
 from ._test_cursor import my_row_factory
 from ._test_connection import testctx  # noqa: F401  # fixture
@@ -33,7 +32,7 @@ async def test_connect(aconn_cls, dsn):
     await conn.close()
 
 
-@crdb_anydb
+@pytest.mark.crdb("skip", reason="can connect to any db name")
 async def test_connect_bad(aconn_cls, dsn):
     with pytest.raises(psycopg.OperationalError):
         await aconn_cls.connect(dsn, dbname="nosuchdb")

diff --git a/tests/test_errors.py b/tests/test_errors.py
index 29619d5581d91a3da736396e46ea3e39b9f7e844..afaf890954d10230082b0112ea01bd05a3e67bfc 100644 (file)
--- a/tests/test_errors.py
+++ b/tests/test_errors.py
@@ -11,7 +11,7 @@ from psycopg import errors as e
 from psycopg import pq
 
 from .utils import eur
-from .fix_crdb import crdb_anydb, is_crdb
+from .fix_crdb import is_crdb
 
 
 def test_finishedpgconn(pgconn):
@@ -286,7 +286,7 @@ def test_unknown_sqlstate(conn):
     assert pexc.sqlstate == code
 
 
-@crdb_anydb
+@pytest.mark.crdb("skip", reason="can connect to any db name")
 def test_pgconn_error(conn_cls, dsn):
     with pytest.raises(psycopg.OperationalError) as excinfo:
         conn_cls.connect(dsn, dbname="nosuchdb")
@@ -296,7 +296,7 @@ def test_pgconn_error(conn_cls, dsn):
     assert exc.pgconn.db == b"nosuchdb"
 
 
-@crdb_anydb
+@pytest.mark.crdb("skip", reason="can connect to any db name")
 def test_pgconn_error_pickle(conn_cls, dsn):
     with pytest.raises(psycopg.OperationalError) as excinfo:
         conn_cls.connect(dsn, dbname="nosuchdb")

diff --git a/tests/test_waiting.py b/tests/test_waiting.py
index 3f137135a9cd05ce9a4eb26684fbdc379a0dd773..61cf99e9e84c2153bd37529351e6720cafa18a07 100644 (file)
--- a/tests/test_waiting.py
+++ b/tests/test_waiting.py
@@ -10,8 +10,6 @@ from psycopg import generators, waiting
 from psycopg.pq import ConnStatus, ExecStatus
 from psycopg.conninfo import make_conninfo
 
-from .fix_crdb import crdb_anydb
-
 skip_if_not_linux = pytest.mark.skipif(
     not sys.platform.startswith("linux"), reason="non-Linux platform"
 )
@@ -41,7 +39,7 @@ def test_wait_conn(dsn, timeout):
     assert conn.status == ConnStatus.OK
 
 
-@crdb_anydb
+@pytest.mark.crdb("skip", reason="can connect to any db name")
 def test_wait_conn_bad(dsn):
     gen = generators.connect(make_conninfo(dsn, dbname="nosuchdb"))
     with pytest.raises(psycopg.OperationalError):
@@ -157,8 +155,8 @@ async def test_wait_conn_async(dsn, timeout):
     assert conn.status == ConnStatus.OK
 
 
-@crdb_anydb
 @pytest.mark.anyio
+@pytest.mark.crdb("skip", reason="can connect to any db name")
 async def test_wait_conn_async_bad(dsn):
     gen = generators.connect(make_conninfo(dsn, dbname="nosuchdb"))
     with pytest.raises(psycopg.OperationalError):