From 3e15a5c32596984d33fb723f43ab0bfaa150cb78 Mon Sep 17 00:00:00 2001 From: Eric Seppanen Date: Mon, 3 May 2021 18:44:13 -0700 Subject: [PATCH] test_runner fixtures: feedback from review I forgot to add these fixes before merging: - typo in Postgres doc-comment - add 'wal_acceptor' to the list of conflicting processes. --- test_runner/fixtures/zenith_fixtures.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test_runner/fixtures/zenith_fixtures.py b/test_runner/fixtures/zenith_fixtures.py index a31f6c3509..0d79a68c6f 100644 --- a/test_runner/fixtures/zenith_fixtures.py +++ b/test_runner/fixtures/zenith_fixtures.py @@ -53,7 +53,7 @@ def zenfixture(func): @pytest.fixture(autouse=True, scope='session') def safety_check(): """ Ensure that no unwanted daemons are running before we start testing. """ - cmd = ['pgrep', '-c', 'pageserver|postgres'] + cmd = ['pgrep', '-c', 'pageserver|postgres|wal_acceptor'] result = subprocess.run(cmd) if result.returncode == 0: # returncode of 0 means it found something. @@ -128,7 +128,7 @@ def pageserver(zenith_cli): class Postgres: - """ An object representing a running pageserver. """ + """ An object representing a running postgres daemon. """ def __init__(self, zenith_cli): self.zenith_cli = zenith_cli