test: change wait_for_readiness to an enum

This so we can wait for both readiness and liveness

test/io/postgrest.py

@@ -2,6 +2,7 @@
 
 import contextlib
 import dataclasses
+import enum
 import os
 import pathlib
 import socket
@@ -36,6 +37,13 @@ class PostgrestTimedOut(Exception):
     "Connecting to PostgREST endpoint timed out."
 
 
+class Admin(str, enum.Enum):
+    "Admin endpoint to wait for before yielding a PostgREST process."
+
+    live = "live"
+    ready = "ready"
+
+
 class PostgrestSession(requests_unixsocket.Session):
     "HTTP client session directed at a PostgREST endpoint."
 
@@ -89,7 +97,7 @@ def run(
     port=None,
     admin_port=None,
     host=None,
-    wait_for_readiness=True,
+    wait_for=Admin.ready,
     wait_max_seconds=1,
     no_pool_connection_available=False,
     no_startup_stdout=True,
@@ -144,8 +152,10 @@ def run(
             process.stdin.write(stdin or b"")
             process.stdin.close()
 
-            if wait_for_readiness:
+            if wait_for == Admin.ready:
                 wait_until_status_code(adminurl + "/ready", wait_max_seconds, 200)
+            elif wait_for == Admin.live:
+                wait_until_status_code(adminurl + "/live", wait_max_seconds, 200)
 
             if no_startup_stdout:
                 process.stdout.read()

test/io/test_auth.py

@@ -164,7 +164,7 @@ def test_fail_with_invalid_password(defaultenv):
     "Connecting with an invalid password should fail without retries."
     uri = f'postgresql://?dbname={defaultenv["PGDATABASE"]}&host={defaultenv["PGHOST"]}&user=some_protected_user&password=invalid_pass'
     env = {**defaultenv, "PGRST_DB_URI": uri}
-    with run(env=env, wait_for_readiness=False) as postgrest:
+    with run(env=env, wait_for=None) as postgrest:
         exitCode = wait_until_exit(postgrest)
         assert exitCode == 1
 

test/io/test_io.py

@@ -17,6 +17,7 @@ from util import (
     match_log,
 )
 from postgrest import (
+    Admin,
     freeport,
     is_ipv6,
     reset_statement_timeout,
@@ -1080,7 +1081,7 @@ def test_empty_schema_cache_log_contains_jwt_role(defaultenv):
     }
     headers = jwtauthheader({"role": "postgrest_test_author"}, SECRET)
 
-    with run(env=env, wait_for_readiness=False) as postgrest:
+    with run(env=env, wait_for=None) as postgrest:
         postgrest.wait_until_scache_starts_loading()
 
         response = postgrest.session.get("/authors_only", headers=headers)
@@ -1325,7 +1326,7 @@ def test_schema_cache_concurrent_notifications(slow_schema_cache_env):
         int(slow_schema_cache_env["PGRST_INTERNAL_SCHEMA_CACHE_QUERY_SLEEP"]) / 1000
     )
 
-    with run(env=slow_schema_cache_env, wait_for_readiness=False) as postgrest:
+    with run(env=slow_schema_cache_env, wait_for=None) as postgrest:
         time.sleep(2 * internal_sleep + 0.1)  # wait for readiness manually
 
         # first request, create a function and set a schema cache reload in progress
@@ -1548,7 +1549,7 @@ def test_fail_with_invalid_dbname_and_automatic_recovery_disabled(defaultenv):
         "PGRST_DB_POOL_AUTOMATIC_RECOVERY": "false",
     }
 
-    with run(env=env, wait_for_readiness=False) as postgrest:
+    with run(env=env, wait_for=None) as postgrest:
         exitCode = wait_until_exit(postgrest)
         assert exitCode == 1
 
@@ -1861,7 +1862,7 @@ def test_log_error_when_empty_schema_cache_on_startup_to_stderr(defaultenv):
         "PGRST_INTERNAL_SCHEMA_CACHE_QUERY_SLEEP": "300",
     }
 
-    with run(env=env, wait_for_readiness=False) as postgrest:
+    with run(env=env, wait_for=None) as postgrest:
         postgrest.wait_until_scache_starts_loading()
 
         response = postgrest.session.get("/projects")
@@ -1882,7 +1883,7 @@ def test_no_double_schema_cache_reload_on_empty_schema(defaultenv):
         "PGRST_INTERNAL_SCHEMA_CACHE_QUERY_SLEEP": "300",
     }
 
-    with run(env=env, port=freeport(), wait_for_readiness=False) as postgrest:
+    with run(env=env, port=freeport(), wait_for=None) as postgrest:
         postgrest.wait_until_scache_starts_loading()
 
         response = postgrest.session.get("/projects")
@@ -1964,7 +1965,7 @@ def test_schema_cache_error_observation(defaultenv):
         "PGRST_DB_EXTRA_SEARCH_PATH": "x",
     }
 
-    with run(env=env, no_startup_stdout=False, wait_for_readiness=False) as postgrest:
+    with run(env=env, no_startup_stdout=False, wait_for=None) as postgrest:
         # TODO: postgrest should exit here, instead it keeps retrying
         # exitCode = wait_until_exit(postgrest)
         # assert exitCode == 1
@@ -1985,7 +1986,7 @@ def test_log_listener_connection_errors(defaultenv):
         "PGRST_DB_CHANNEL_ENABLED": "true",
     }
 
-    with run(env=env, no_startup_stdout=False, wait_for_readiness=False) as postgrest:
+    with run(env=env, no_startup_stdout=False, wait_for=None) as postgrest:
         output = postgrest.read_stdout(nlines=5)
         assert any(
             'Failed listening for database notifications on the "pgrst" channel. could not translate host name "no_host" to address:'
@@ -2002,7 +2003,7 @@ def test_log_listener_connection_start(defaultenv):
         "PGRST_DB_CHANNEL_ENABLED": "true",
     }
 
-    with run(env=env, no_startup_stdout=False, wait_for_readiness=True) as postgrest:
+    with run(env=env, no_startup_stdout=False, wait_for=Admin.ready) as postgrest:
         output = postgrest.read_stdout(nlines=10)
         # Check for the listener start message containing host and port
         # Do not check if pg version is displayed properly as it is tricky to test it
@@ -2030,7 +2031,7 @@ def test_db_pre_config_with_pg_reserved_words(defaultenv):
         "PGRST_DB_PRE_CONFIG": "select",  # no "select" function in our fixtures, fail gracefully at startup
     }
 
-    with run(env=env, no_startup_stdout=False, wait_for_readiness=False) as postgrest:
+    with run(env=env, no_startup_stdout=False, wait_for=None) as postgrest:
         output = postgrest.read_stdout(nlines=8)
         assert any(
             'Failed to query database settings for the config parameters.{"code":"42883","details":null,"hint":"No function matches the given name and argument types. You might need to add explicit type casts.","message":"function select() does not exist"}'
@@ -2171,7 +2172,7 @@ def test_positive_pool_metric(defaultenv):
     with run_pgproxy(defaultenv, proxy_timeout="10ms") as pgproxyhost:
         env = {**defaultenv, "PGHOST": pgproxyhost}
 
-        with run(env=env, wait_for_readiness=False) as postgrest:
+        with run(env=env, wait_for=None) as postgrest:
             time.sleep(3)
 
             response = postgrest.admin.get("/metrics", timeout=1)