From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 25 Mar 2025 09:05:28 +0000 (+0100)
Subject: dnsdist: Fix a harmless but ugly TOCTOU in the regression tests
X-Git-Tag: dnsdist-2.0.0-alpha2~115^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47cd3d6a739d8521b991e6b273caa8912c571b26;p=thirdparty%2Fpdns.git

dnsdist: Fix a harmless but ugly TOCTOU in the regression tests

As suggested by Miod (thanks!).
---

diff --git a/regression-tests.dnsdist/dnsdisttests.py b/regression-tests.dnsdist/dnsdisttests.py
index 65b17224ec..a315d8a196 100644
--- a/regression-tests.dnsdist/dnsdisttests.py
+++ b/regression-tests.dnsdist/dnsdisttests.py
@@ -161,8 +161,11 @@ class DNSDistTest(AssertEqualDNSMessageMixin, unittest.TestCase):
             if not cls._yaml_config_template:
               conf.write("\n")
               conf.write("setSecurityPollSuffix('')")
-        elif os.path.exists(luaConfFile):
-          os.unlink(luaConfFile)
+        else:
+          try:
+            os.unlink(luaConfFile)
+          except OSError:
+            pass
 
         if cls._skipListeningOnCL:
           dnsdistcmd = [os.environ['DNSDISTBIN'], '--supervised', '-C', confFile ]