Skip to content

Commit fb7d100

Browse files
committed
Split the test in 2 phases for reliability
1 parent 807b2a9 commit fb7d100

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

tests/test_path_unlink.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def test_unmonitored_mounted_dir(test_container, test_file, server):
231231

232232
def test_probe_inode_map(monitored_dir, ignored_dir, server):
233233
"""
234-
TODO[ROX-33222]: This test won't work when hardlinks are handled properly.
234+
TODO[ROX-33222]: This test won't work when hardlinks are handled properly.
235235
236236
This test demonstrates that the current implementation removes the inode
237237
from the kernel map correctly, as a second unmonitored hardlink deletion
@@ -258,6 +258,11 @@ def test_probe_inode_map(monitored_dir, ignored_dir, server):
258258
hardlink_file2 = os.path.join(ignored_dir, 'hardlink2.txt')
259259
os.link(original_file, hardlink_file2)
260260

261+
e = Event(process=process, event_type=EventType.CREATION,
262+
file=original_file, host_path=original_file)
263+
264+
server.wait_events([e])
265+
261266
os.remove(hardlink_file1)
262267
os.remove(hardlink_file2)
263268

@@ -267,8 +272,6 @@ def test_probe_inode_map(monitored_dir, ignored_dir, server):
267272
f.write('guard')
268273

269274
events = [
270-
Event(process=process, event_type=EventType.CREATION,
271-
file=original_file, host_path=original_file),
272275
Event(process=process, event_type=EventType.UNLINK,
273276
file=hardlink_file1, host_path=original_file),
274277
Event(process=process, event_type=EventType.CREATION,

0 commit comments

Comments
 (0)