]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
dnsdist: Fix a harmless but ugly TOCTOU in the regression tests 15351/head
authorRemi Gacogne <remi.gacogne@powerdns.com>
Tue, 25 Mar 2025 09:05:28 +0000 (10:05 +0100)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Tue, 25 Mar 2025 09:05:28 +0000 (10:05 +0100)
As suggested by Miod (thanks!).

regression-tests.dnsdist/dnsdisttests.py

index 65b17224ecb37d9a90ccf2be9b7abf357fb40269..a315d8a196b59f92189931b8edfbf07489f7b331 100644 (file)
@@ -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 ]