From b541981cac11a22c93eb16db6f342ff0cfac0198 Mon Sep 17 00:00:00 2001
From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Mon, 28 Jun 2021 13:00:36 +0100
Subject: [PATCH] Fix tests run with libpq 9.6

---
 tests/pq/test_conninfo.py | 13 +++++++++++++
 tests/pq/test_pgconn.py   |  3 +--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/tests/pq/test_conninfo.py b/tests/pq/test_conninfo.py
index 91184a348..a7cbc15c2 100644
--- a/tests/pq/test_conninfo.py
+++ b/tests/pq/test_conninfo.py
@@ -17,6 +17,7 @@ def test_defaults(monkeypatch):
     assert port.dispsize == 6
 
 
+@pytest.mark.libpq(">= 10")
 def test_conninfo_parse():
     info = pq.Conninfo.parse(
         b"postgresql://host1:123,host2:456/somedb"
@@ -29,6 +30,18 @@ def test_conninfo_parse():
     assert info[b"application_name"] == b"myapp"
 
 
+@pytest.mark.libpq("< 10")
+def test_conninfo_parse_96():
+    info = pq.Conninfo.parse(
+        b"postgresql://other@localhost/otherdb"
+        b"?connect_timeout=10&application_name=myapp"
+    )
+    info = {i.keyword: i.val for i in info if i.val is not None}
+    assert info[b"host"] == b"localhost"
+    assert info[b"dbname"] == b"otherdb"
+    assert info[b"application_name"] == b"myapp"
+
+
 def test_conninfo_parse_bad():
     with pytest.raises(psycopg.OperationalError) as e:
         pq.Conninfo.parse(b"bad_conninfo=")
diff --git a/tests/pq/test_pgconn.py b/tests/pq/test_pgconn.py
index cb1665f89..2fcfaee2e 100644
--- a/tests/pq/test_pgconn.py
+++ b/tests/pq/test_pgconn.py
@@ -167,7 +167,7 @@ def test_ping(dsn):
     rv = pq.PGconn.ping(dsn.encode("utf8"))
     assert rv == pq.Ping.OK
 
-    rv = pq.PGconn.ping(b"port=99999")
+    rv = pq.PGconn.ping(b"port=9999")
     assert rv == pq.Ping.NO_RESPONSE
 
 
@@ -212,7 +212,6 @@ def test_hostaddr(pgconn):
         pgconn.hostaddr
 
 
-@pytest.mark.xfail
 @pytest.mark.libpq("< 12")
 def test_hostaddr_missing(pgconn):
     with pytest.raises(psycopg.NotSupportedError):
-- 
2.47.3