From 8c42aeac9fa7d7fd9c49b63bb28ec0fa02466955 Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Mon, 21 Aug 2023 18:28:42 +0300 Subject: [PATCH] test: move log to assert message --- test_runner/regress/test_layer_eviction.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/test_runner/regress/test_layer_eviction.py b/test_runner/regress/test_layer_eviction.py index 8f627defb5..bb19797115 100644 --- a/test_runner/regress/test_layer_eviction.py +++ b/test_runner/regress/test_layer_eviction.py @@ -256,32 +256,29 @@ def test_gc_of_remote_layers(neon_env_builder: NeonEnvBuilder): ps_http.evict_all_layers(tenant_id, timeline_id) def ensure_resident_and_remote_size_metrics(): - log.info("ensure that all the layers are gone") resident_layers = list(env.timeline_dir(tenant_id, timeline_id).glob("*-*_*")) # we have disabled all background loops, so, this should hold - assert len(resident_layers) == 0 + assert len(resident_layers) == 0, "ensure that all the layers are gone" info = ps_http.layer_map_info(tenant_id, timeline_id) log.info("layer map dump: %s", info) - log.info("ensure that resident_physical_size metric is zero") resident_physical_size_metric = ps_http.get_timeline_metric( tenant_id, timeline_id, "pageserver_resident_physical_size" ) - assert resident_physical_size_metric == 0 - log.info("ensure that resident_physical_size metric corresponds to layer map dump") + assert ( + resident_physical_size_metric == 0 + ), "ensure that resident_physical_size metric is zero" assert resident_physical_size_metric == sum( - [layer.layer_file_size or 0 for layer in info.historic_layers if not layer.remote] - ) + layer.layer_file_size or 0 for layer in info.historic_layers if not layer.remote + ), "ensure that resident_physical_size metric corresponds to layer map dump" - log.info("ensure that remote_physical_size metric matches layer map") remote_physical_size_metric = ps_http.get_timeline_metric( tenant_id, timeline_id, "pageserver_remote_physical_size" ) - log.info("ensure that remote_physical_size metric corresponds to layer map dump") assert remote_physical_size_metric == sum( layer.layer_file_size or 0 for layer in info.historic_layers if layer.remote - ) + ), "ensure that remote_physical_size metric corresponds to layer map dump" log.info("before runnning GC, ensure that remote_physical size is zero") ensure_resident_and_remote_size_metrics()