test: Separated query and loading internal sleep configs

To make schema cache loading wait tests robust it is necessary to provide three separate internal config variables:
* "internal-schema-cache-query-sleep" - introduces delay in schema queries execution
* "internal-schema-cache-load-sleep" - introduces delay between schema queries execution and processing their results
* "internal-schema-cache-relationship-load-sleep" - introduces delay in processing relationship query results

Thanks to these changes it is now possible to test various schema loading scenarios with the right granularity robustly (eg. make sure requests wait for schema loading but not for relationship loading).

test/io/conftest.py

@@ -61,7 +61,7 @@ def slow_schema_cache_env(defaultenv):
     "Slow schema cache load environment PostgREST."
     return {
         **defaultenv,
-        "PGRST_INTERNAL_SCHEMA_CACHE_SLEEP": "1000",  # this does a pg_sleep internally, it will cause the schema cache query to be slow
+        "PGRST_INTERNAL_SCHEMA_CACHE_QUERY_SLEEP": "1000",  # this does a pg_sleep internally, it will cause the schema cache query to be slow
         # the slow schema cache query will keep using one pool connection until it finishes
         # to prevent requests waiting for PGRST_DB_POOL_ACQUISITION_TIMEOUT we'll increase the pool size (must be >= 2)
         "PGRST_DB_POOL": "2",

test/io/test_big_schema.py

@@ -2,7 +2,6 @@
 
 import pytest
 
-from util import parse_server_timings_header
 from postgrest import run
 
 
@@ -14,7 +13,7 @@ def test_requests_with_resource_embedding_wait_for_schema_cache_reload(defaulten
         "PGRST_DB_SCHEMAS": "apflora",
         "PGRST_DB_POOL": "2",
         "PGRST_DB_ANON_ROLE": "postgrest_test_anonymous",
-        "PGRST_SERVER_TIMING_ENABLED": "true",
+        "PGRST_INTERNAL_SCHEMA_CACHE_RELATIONSHIP_LOAD_SLEEP": "5100",
     }
 
     with run(env=env, wait_max_seconds=30) as postgrest:
@@ -27,10 +26,7 @@ def test_requests_with_resource_embedding_wait_for_schema_cache_reload(defaulten
         response = postgrest.session.get("/tpopmassn?select=*,tpop(*)")
         assert response.status_code == 200
 
-        plan_dur = parse_server_timings_header(response.headers["Server-Timing"])[
-            "plan"
-        ]
-        assert plan_dur > 10000.0
+        assert response.elapsed.total_seconds() > 5
 
 
 def test_requests_without_resource_embedding_wait_for_schema_cache_reload(defaultenv):
@@ -41,7 +37,8 @@ def test_requests_without_resource_embedding_wait_for_schema_cache_reload(defaul
         "PGRST_DB_SCHEMAS": "apflora",
         "PGRST_DB_POOL": "2",
         "PGRST_DB_ANON_ROLE": "postgrest_test_anonymous",
-        "PGRST_SERVER_TIMING_ENABLED": "true",
+        "PGRST_INTERNAL_SCHEMA_CACHE_LOAD_SLEEP": "1100",
+        "PGRST_INTERNAL_SCHEMA_CACHE_RELATIONSHIP_LOAD_SLEEP": "5000",
     }
 
     with run(env=env, wait_max_seconds=30) as postgrest:
@@ -54,10 +51,10 @@ def test_requests_without_resource_embedding_wait_for_schema_cache_reload(defaul
         response = postgrest.session.get("/tpopmassn")
         assert response.status_code == 200
 
-        plan_dur = parse_server_timings_header(response.headers["Server-Timing"])[
-            "plan"
-        ]
-        assert plan_dur < 10000.0
+        assert (
+            response.elapsed.total_seconds() > 1
+            and response.elapsed.total_seconds() < 5
+        )
 
 
 # TODO: This test fails now because of https://github.com/PostgREST/postgrest/pull/2122

test/io/test_cli.py

@@ -312,13 +312,13 @@ def test_cli_ready_flag_fail_when_schema_cache_not_loaded(defaultenv, metapostgr
         **defaultenv,
         "PGUSER": role,
         "PGRST_DB_ANON_ROLE": role,
-        "PGRST_INTERNAL_SCHEMA_CACHE_SLEEP": "500",
+        "PGRST_INTERNAL_SCHEMA_CACHE_QUERY_SLEEP": "500",
     }
 
     port = freeport()
 
     with run(env=env, port=port) as postgrest:
-        # The schema cache query takes at least 500ms, due to PGRST_INTERNAL_SCHEMA_CACHE_SLEEP above.
+        # The schema cache query takes at least 500ms, due to PGRST_INTERNAL_SCHEMA_CACHE_QUERY_SLEEP above.
         # Make it impossible to load the schema cache, by setting statement timeout to 400ms.
         set_statement_timeout(metapostgrest, role, 400)
 

test/io/test_io.py

@@ -825,11 +825,11 @@ def test_admin_ready_includes_schema_cache_state(defaultenv, metapostgrest):
         **defaultenv,
         "PGUSER": role,
         "PGRST_DB_ANON_ROLE": role,
-        "PGRST_INTERNAL_SCHEMA_CACHE_SLEEP": "500",
+        "PGRST_INTERNAL_SCHEMA_CACHE_QUERY_SLEEP": "500",
     }
 
     with run(env=env) as postgrest:
-        # The schema cache query takes at least 500ms, due to PGRST_INTERNAL_SCHEMA_CACHE_SLEEP above.
+        # The schema cache query takes at least 500ms, due to PGRST_INTERNAL_SCHEMA_CACHE_QUERY_SLEEP above.
         # Make it impossible to load the schema cache, by setting statement timeout to 400ms.
         set_statement_timeout(metapostgrest, role, 400)
 
@@ -855,11 +855,11 @@ def test_metrics_include_schema_cache_fails(defaultenv, metapostgrest):
     env = {
         **defaultenv,
         "PGUSER": role,
-        "PGRST_INTERNAL_SCHEMA_CACHE_SLEEP": "50",
+        "PGRST_INTERNAL_SCHEMA_CACHE_QUERY_SLEEP": "50",
     }
 
     with run(env=env) as postgrest:
-        # The schema cache query takes at least 20ms, due to PGRST_INTERNAL_SCHEMA_CACHE_SLEEP above.
+        # The schema cache query takes at least 20ms, due to PGRST_INTERNAL_SCHEMA_CACHE_QUERY_SLEEP above.
         # Make it impossible to load the schema cache, by setting statement timeout to 100ms.
         set_statement_timeout(metapostgrest, role, 20)
 
@@ -1320,7 +1320,7 @@ def test_schema_cache_concurrent_notifications(slow_schema_cache_env):
     "schema cache should be up-to-date whenever a notification is sent while another reload is in progress, see https://github.com/PostgREST/postgrest/issues/2791"
 
     internal_sleep = (
-        int(slow_schema_cache_env["PGRST_INTERNAL_SCHEMA_CACHE_SLEEP"]) / 1000
+        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:

test/spec/SpecHelper.hs

@@ -157,7 +157,9 @@ baseCfg = let secret = encodeUtf8 "reallyreallyreallyreallyverysafe" in
   , configAdminServerPort           = Nothing
   , configRoleSettings              = mempty
   , configRoleIsoLvl                = mempty
-  , configInternalSCSleep           = Nothing
+  , configInternalSCQuerySleep      = Nothing
+  , configInternalSCLoadSleep       = Nothing
+  , configInternalSCRelLoadSleep    = Nothing
   , configServerTimingEnabled       = True
   }