From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 21 Nov 2023 02:00:36 +0000 (+0100)
Subject: fix: flush PG environment variables in test_connect{,_args}
X-Git-Tag: 3.1.14~5^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f060855aa6126e811de243c7213d2caff9c88123;p=thirdparty%2Fpsycopg.git

fix: flush PG environment variables in test_connect{,_args}

These tests were previously affected by environment variables, that can
be used to configure a postgresql instance.

Closes: #681
---

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 52808af03..10f0a6ca7 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -409,6 +409,7 @@ def test_connect_args(conn_cls, monkeypatch, setpgenv, pgconn, args, kwargs, wan
         return pgconn
         yield
 
+    setpgenv({})
     monkeypatch.setattr(psycopg.connection, "connect", fake_connect)
     conn = conn_cls.connect(*args, **kwargs)
     got_params = drop_default_args_from_conninfo(got_conninfo)
diff --git a/tests/test_module.py b/tests/test_module.py
index 030b75808..948c00b93 100644
--- a/tests/test_module.py
+++ b/tests/test_module.py
@@ -15,7 +15,7 @@ from .test_connection import drop_default_args_from_conninfo
         ((), {"user": "foo", "dbname": None}, "user=foo"),
     ],
 )
-def test_connect(monkeypatch, dsn, args, kwargs, want):
+def test_connect(monkeypatch, dsn, args, kwargs, want, setpgenv):
     # Check the main args passing from psycopg.connect to the conn generator
     # Details of the params manipulation are in test_conninfo.
     import psycopg.connection
@@ -29,6 +29,7 @@ def test_connect(monkeypatch, dsn, args, kwargs, want):
         got_conninfo = conninfo
         return orig_connect(dsn)
 
+    setpgenv({})
     monkeypatch.setattr(psycopg.connection, "connect", mock_connect)
 
     conn = psycopg.connect(*args, **kwargs)
diff --git a/tests/test_psycopg_dbapi20.py b/tests/test_psycopg_dbapi20.py
index bc8b1cc95..69c2fa756 100644
--- a/tests/test_psycopg_dbapi20.py
+++ b/tests/test_psycopg_dbapi20.py
@@ -133,7 +133,7 @@ def test_time_from_ticks(ticks, want):
         (("host=foo",), {"user": None}, "host=foo"),
     ],
 )
-def test_connect_args(monkeypatch, pgconn, args, kwargs, want):
+def test_connect_args(monkeypatch, pgconn, args, kwargs, want, setpgenv):
     got_conninfo: str
 
     def fake_connect(conninfo):
@@ -142,6 +142,7 @@ def test_connect_args(monkeypatch, pgconn, args, kwargs, want):
         return pgconn
         yield
 
+    setpgenv({})
     monkeypatch.setattr(psycopg.connection, "connect", fake_connect)
     conn = psycopg.connect(*args, **kwargs)
     assert drop_default_args_from_conninfo(got_conninfo) == conninfo_to_dict(want)