From 39490ddd6c4ec060de081aa9e0265f44b004fd14 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Fri, 26 Jan 2024 10:10:08 +0000 Subject: [PATCH] fix other detected process leakage in the lowest-effort-way possible --- test_runner/regress/test_import.py | 3 ++- test_runner/regress/test_neon_local_cli.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test_runner/regress/test_import.py b/test_runner/regress/test_import.py index faedf5d944..30092fdc6e 100644 --- a/test_runner/regress/test_import.py +++ b/test_runner/regress/test_import.py @@ -24,7 +24,8 @@ from fixtures.types import Lsn, TenantId, TimelineId from fixtures.utils import subprocess_capture -def test_import_from_vanilla(test_output_dir, pg_bin, vanilla_pg, neon_env_builder): +# fixture order matters here: neon_env_builder leaked process assertions +def test_import_from_vanilla(test_output_dir, pg_bin, neon_env_builder, vanilla_pg): # Put data in vanilla pg vanilla_pg.start() vanilla_pg.safe_psql("create user cloud_admin with password 'postgres' superuser") diff --git a/test_runner/regress/test_neon_local_cli.py b/test_runner/regress/test_neon_local_cli.py index 46b72fbca5..8edba49b8a 100644 --- a/test_runner/regress/test_neon_local_cli.py +++ b/test_runner/regress/test_neon_local_cli.py @@ -59,3 +59,5 @@ def test_neon_two_primary_endpoints_fail( env.neon_cli.endpoint_stop("ep1") # ep1 is stopped so create ep2 will succeed env.neon_cli.endpoint_start("ep2") + # cleanup + env.neon_cli.endpoint_stop("ep2")