test: more uniform treatment of timeout approx check

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 0f2f768be252634e3ff803cb3c12f35f5be76e17..c9a7c7bfe477f368195e4ba780361d8a06b1fd43 100644 (file)
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -52,7 +52,7 @@ def test_connect_timeout(conn_cls, proxy):
         with pytest.raises(psycopg.OperationalError, match="timeout expired"):
             conn_cls.connect(proxy.client_dsn, connect_timeout=2)
         elapsed = time.time() - t0
-    assert elapsed == pytest.approx(2.0, abs=0.05)
+    assert elapsed == pytest.approx(2.0, 0.1)
 
 
 @pytest.mark.slow
@@ -67,7 +67,7 @@ def test_multi_hosts(conn_cls, proxy, dsn, monkeypatch):
         t0 = time.time()
         with conn_cls.connect(**args) as conn:
             elapsed = time.time() - t0
-            assert 2.0 < elapsed < 2.5
+            assert elapsed == pytest.approx(2.0, 0.1)
             assert conn.info.port == int(proxy.server_port)
             assert conn.info.host == proxy.server_host
 
@@ -84,7 +84,7 @@ def test_multi_hosts_timeout(conn_cls, proxy, dsn):
         t0 = time.time()
         with conn_cls.connect(**args) as conn:
             elapsed = time.time() - t0
-            assert 2.0 < elapsed < 2.5
+            assert elapsed == pytest.approx(2.0, 0.1)
             assert conn.info.port == int(proxy.server_port)
             assert conn.info.host == proxy.server_host
 
@@ -837,7 +837,7 @@ def test_cancel_safe_timeout(conn_cls, proxy):
             with pytest.raises(e.CancellationTimeout, match="timeout expired"):
                 conn.cancel_safe(timeout=1)
     elapsed = time.time() - t0
-    assert elapsed == pytest.approx(1.0, abs=0.05)
+    assert elapsed == pytest.approx(1.0, 0.1)
 
 
 def test_resolve_hostaddr_conn(conn_cls, monkeypatch, fake_resolve):

diff --git a/tests/test_connection_async.py b/tests/test_connection_async.py
index cc293babfed2b37bec835eb654268e90eeb650fa..7d0932ea222945150aa64cd896c08c963cfbf691 100644 (file)
--- a/tests/test_connection_async.py
+++ b/tests/test_connection_async.py
@@ -48,7 +48,7 @@ async def test_connect_timeout(aconn_cls, proxy):
         with pytest.raises(psycopg.OperationalError, match="timeout expired"):
             await aconn_cls.connect(proxy.client_dsn, connect_timeout=2)
         elapsed = time.time() - t0
-    assert elapsed == pytest.approx(2.0, abs=0.05)
+    assert elapsed == pytest.approx(2.0, 0.1)
 
 
 @pytest.mark.slow
@@ -63,7 +63,7 @@ async def test_multi_hosts(aconn_cls, proxy, dsn, monkeypatch):
         t0 = time.time()
         async with await aconn_cls.connect(**args) as conn:
             elapsed = time.time() - t0
-            assert 2.0 < elapsed < 2.5
+            assert elapsed == pytest.approx(2.0, 0.1)
             assert conn.info.port == int(proxy.server_port)
             assert conn.info.host == proxy.server_host
 
@@ -80,7 +80,7 @@ async def test_multi_hosts_timeout(aconn_cls, proxy, dsn):
         t0 = time.time()
         async with await aconn_cls.connect(**args) as conn:
             elapsed = time.time() - t0
-            assert 2.0 < elapsed < 2.5
+            assert elapsed == pytest.approx(2.0, 0.1)
             assert conn.info.port == int(proxy.server_port)
             assert conn.info.host == proxy.server_host
 
@@ -841,7 +841,7 @@ async def test_cancel_safe_timeout(aconn_cls, proxy):
             with pytest.raises(e.CancellationTimeout, match="timeout expired"):
                 await aconn.cancel_safe(timeout=1)
     elapsed = time.time() - t0
-    assert elapsed == pytest.approx(1.0, abs=0.05)
+    assert elapsed == pytest.approx(1.0, 0.1)
 
 
 async def test_resolve_hostaddr_conn(aconn_cls, monkeypatch, fake_resolve):