merge: testing → main (reconcile 2-week divergence)

This commit is contained in:
2026-04-28 18:36:00 -04:00
parent 499836c9e4
commit 862e4dbb31
1235 changed files with 160255 additions and 7996 deletions

View File

@@ -60,13 +60,18 @@ class TestPostgresLive:
def test_auth_hash_logged(self, live_service):
port, drain = live_service("postgres")
import psycopg2
# Real PG rejects before asking for a password when the requested
# db doesn't exist, and the honeypot faithfully mirrors that. So
# we must target an always-present database (``postgres`` is in
# _BASE_DBS) to get past startup and into the password-auth stage
# that this test is asserting on.
try:
psycopg2.connect(
host="127.0.0.1",
port=port,
user="root",
password="toor",
dbname="prod",
dbname="postgres",
connect_timeout=5,
)
except psycopg2.OperationalError: