From: Denis Laxalde <denis.laxalde@dalibo.com>
Date: Fri, 5 Nov 2021 10:47:10 +0000 (+0100)
Subject: Catch explicit exception type in test_connect_badargs()
X-Git-Tag: 3.0.3~3^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe77e3b7fd71d98c5c1e57b52150201260e81c32;p=thirdparty%2Fpsycopg.git

Catch explicit exception type in test_connect_badargs()

Work around the type of pytest.raises() which appears too strict.
---

diff --git a/tests/test_connection.py b/tests/test_connection.py
index dc8c6bc59..977361f1d 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -334,20 +334,20 @@ def test_connect_args(monkeypatch, pgconn, args, kwargs, want):
 
 
 @pytest.mark.parametrize(
-    "args, kwargs",
+    "args, kwargs, exctype",
     [
-        (("host=foo", "host=bar"), {}),
-        (("", ""), {}),
-        ((), {"nosuchparam": 42}),
+        (("host=foo", "host=bar"), {}, TypeError),
+        (("", ""), {}, TypeError),
+        ((), {"nosuchparam": 42}, psycopg.ProgrammingError),
     ],
 )
-def test_connect_badargs(monkeypatch, pgconn, args, kwargs):
+def test_connect_badargs(monkeypatch, pgconn, args, kwargs, exctype):
     def fake_connect(conninfo):
         return pgconn
         yield
 
     monkeypatch.setattr(psycopg.connection, "connect", fake_connect)
-    with pytest.raises((TypeError, psycopg.ProgrammingError)):
+    with pytest.raises(exctype):
         psycopg.Connection.connect(*args, **kwargs)
 
 
diff --git a/tests/test_connection_async.py b/tests/test_connection_async.py
index 579b6335e..568ea39bb 100644
--- a/tests/test_connection_async.py
+++ b/tests/test_connection_async.py
@@ -344,20 +344,20 @@ async def test_connect_args(monkeypatch, pgconn, args, kwargs, want):
 
 
 @pytest.mark.parametrize(
-    "args, kwargs",
+    "args, kwargs, exctype",
     [
-        (("host=foo", "host=bar"), {}),
-        (("", ""), {}),
-        ((), {"nosuchparam": 42}),
+        (("host=foo", "host=bar"), {}, TypeError),
+        (("", ""), {}, TypeError),
+        ((), {"nosuchparam": 42}, psycopg.ProgrammingError),
     ],
 )
-async def test_connect_badargs(monkeypatch, pgconn, args, kwargs):
+async def test_connect_badargs(monkeypatch, pgconn, args, kwargs, exctype):
     def fake_connect(conninfo):
         return pgconn
         yield
 
     monkeypatch.setattr(psycopg.connection, "connect", fake_connect)
-    with pytest.raises((TypeError, psycopg.ProgrammingError)):
+    with pytest.raises(exctype):
         await psycopg.AsyncConnection.connect(*args, **kwargs)