Merge pull request #1000 from SUSE/bind_links

Handle symlinks in tmpfiles creation

Author: dirkmueller

tests/test_base.py

@@ -138,10 +138,10 @@ def test_base_size(container: ContainerData, container_runtime):
             base_container_max_size["x86_64"] += 10
     elif OS_VERSION in ("tumbleweed",):
         base_container_max_size: Dict[str, int] = {
-            "x86_64": 101,
-            "aarch64": 117,
-            "ppc64le": 128,
-            "s390x": 93,
+            "x86_64": 103,
+            "aarch64": 119,
+            "ppc64le": 130,
+            "s390x": 95,
         }
     elif OS_VERSION in ("16.0", "16.1"):
         base_container_max_size: Dict[str, int] = {

tests/test_bind.py

@@ -233,10 +233,10 @@ def test_tmpfiles_d_created(container: ContainerData) -> None:
         tp, path, mode, owner, group, age, arg = line.split()
 
         # sanity check, we don't handle these below at all
-        assert age == "-" and arg == "-"
+        assert age == "-"
 
         # another sanity check because we don't test other tmpfiles.d constructs
-        assert tp in ("d", "C")
+        assert tp in ("d", "C", "L")
 
         # directories
         if tp == "d":
@@ -253,3 +253,12 @@ def test_tmpfiles_d_created(container: ContainerData) -> None:
             assert file.exists
             assert file.is_file
             assert owner == "-" and group == "-" and mode == "-"
+
+        # linked files
+        elif tp == "L":
+            file = container.connection.file(path)
+            assert file.exists
+            assert file.is_symlink
+            assert (Path(path).parent / arg).resolve() == Path(
+                file.linked_to
+            ).resolve()