From e6a098718275206f82fc608e6282f35b52dfeed2 Mon Sep 17 00:00:00 2001 From: Eric Seppanen Date: Mon, 3 May 2021 23:32:06 -0700 Subject: [PATCH] python fixtures: enable "zenith pageserver stop" Replaces "killall pageserver", which doesn't work if you don't have the psmisc package installed. --- test_runner/fixtures/zenith_fixtures.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test_runner/fixtures/zenith_fixtures.py b/test_runner/fixtures/zenith_fixtures.py index 0d79a68c6f..c4534f4eb2 100644 --- a/test_runner/fixtures/zenith_fixtures.py +++ b/test_runner/fixtures/zenith_fixtures.py @@ -109,13 +109,8 @@ class ZenithPageserver: self.running = True def stop(self): - # FIXME: this is a todo!() in the zenith cli code - if self.running: - try: - subprocess.run(['killall', 'pageserver']) - except FileNotFoundError: - print( - 'WARNING: Failed to terminate pageserver, "killall" not found', file=sys.stderr) + self.zenith_cli.run(['pageserver', 'stop']) + self.running = True @zenfixture