From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 19 Nov 2025 14:35:45 +0000 (-0500) Subject: Make RecursorTest.killProcess always return void X-Git-Tag: rec-5.4.0-alpha1~63^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=885ad2f7577dd1fd6f1e5511de9b584b7cdae24d;p=thirdparty%2Fpdns.git Make RecursorTest.killProcess always return void Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- diff --git a/regression-tests.recursor-dnssec/recursortests.py b/regression-tests.recursor-dnssec/recursortests.py index e05067cc26..536a15c6bf 100644 --- a/regression-tests.recursor-dnssec/recursortests.py +++ b/regression-tests.recursor-dnssec/recursortests.py @@ -795,13 +795,14 @@ distributor-threads={threads} print("kill...", p, file=sys.stderr) p.kill() p.wait() - return p + return except OSError as e: # There is a race-condition with the poll() and # kill() statements, when the process is dead on the # kill(), this is fine if e.errno != errno.ESRCH: raise + return @classmethod def tearDownAuth(cls):