fix: test_cross_mountpoints skips ownership events when users match

Author: Molter73

tests/test_path_rename.py

@@ -451,28 +451,39 @@ def test_cross_mountpoints(
         container_id=test_container.id[:12],
     )
 
-    server.wait_events(
-        [
-            Event(
-                process=touch,
-                event_type=EventType.OPEN,
-                file=mounted_file,
-                host_path=host_path,
-            ),
-            Event(
-                process=first_rename,
-                event_type=EventType.CREATION,
-                file=ovfs_file,
-                host_path='',
-            ),
+    events = [
+        Event(
+            process=touch,
+            event_type=EventType.OPEN,
+            file=mounted_file,
+            host_path=host_path,
+        ),
+        Event(
+            process=first_rename,
+            event_type=EventType.CREATION,
+            file=ovfs_file,
+            host_path='',
+        ),
+    ]
+
+    # If the id for the current process and the process in the container (root)
+    # match, the ownership events are skipped
+    curr_id = (os.getuid(), os.getgid())
+    root_id = (0, 0)
+    if curr_id != root_id:
+        events.append(
             Event(
                 process=first_rename,
                 event_type=EventType.OWNERSHIP,
                 file=ovfs_file,
                 host_path='',
                 owner_uid=owner_uid,
                 owner_gid=owner_gid,
-            ),
+            )
+        )
+
+    events.extend(
+        [
             Event(
                 process=first_rename,
                 event_type=EventType.PERMISSION,
@@ -492,14 +503,23 @@ def test_cross_mountpoints(
                 file=mounted_file,
                 host_path=host_path,
             ),
+        ]
+    )
+
+    if curr_id != root_id:
+        events.append(
             Event(
                 process=second_rename,
                 event_type=EventType.OWNERSHIP,
                 file=mounted_file,
                 host_path=host_path,
                 owner_uid=owner_uid,
                 owner_gid=owner_gid,
-            ),
+            )
+        )
+
+    events.extend(
+        [
             Event(
                 process=second_rename,
                 event_type=EventType.PERMISSION,
@@ -513,5 +533,7 @@ def test_cross_mountpoints(
                 file=ovfs_file,
                 host_path='',
             ),
-        ],
+        ]
     )
+
+    server.wait_events(events)