From: Vincent Bernat <vincent@bernat.ch>
Date: Tue, 4 May 2021 15:07:49 +0000 (+0200)
Subject: tests: use a tmpfs for /var/lock and handle broken symlinks
X-Git-Tag: 1.0.12~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=104cdb42d0b7ed0ec46b7ca9b32e7c9beb0e13a0;p=thirdparty%2Flldpd.git

tests: use a tmpfs for /var/lock and handle broken symlinks
---

diff --git a/tests/integration/fixtures/programs.py b/tests/integration/fixtures/programs.py
index eb085c21..04e27153 100644
--- a/tests/integration/fixtures/programs.py
+++ b/tests/integration/fixtures/programs.py
@@ -207,11 +207,11 @@ protocols: files
 services: files
 """)
 
-        # Ensure lock directory also exists
-        try:
-            os.makedirs("/var/lock", mode=0o1777)
-        except FileExistsError:
-            pass
+        # Ensure lock directory also exists. This can be a broken symlink!
+        path = os.path.realpath("/var/lock")
+        if not os.path.isdir(path):
+            os.mkdir(path)
+        mount_tmpfs(path)
 
         # Remove any config
         path = os.path.join(self.config.lldpd.confdir, "lldpd.conf")