luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-26 20:19:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'macos-testfilemonitor-fix' into 'main'

Browse Source 
testfilemonitor: treat `CHANGES_DONE_HINT` as optional when events don’t match

Closes #1181

See merge request GNOME/glib!4905
This commit is contained in:
Philip Withnall
2025-11-20 13:25:47 +00:00
parent 9764f3f094 1051394c36
commit 8c2ce2bb7a
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/tests/meson.build
View File

@@ -139,8 +139,6 @@ gio_tests = {
'glistmodel' : {}, 'glistmodel' : {},
'testfilemonitor' : { 'testfilemonitor' : {
'suite' : ['slow'], 'suite' : ['slow'],
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
'can_fail' : host_system in ['darwin'],
}, },
'thumbnail-verification' : {}, 'thumbnail-verification' : {},
'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']}, 'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']},

11
gio/tests/testfilemonitor.c
View File

@@ -237,6 +237,17 @@ check_expected_events (RecordedEvent *expected,
li++, l = l->next; li++, l = l->next;
continue; continue;
} }
/* The ordering of 'CHANGES_DONE_HINT' can not be guaranteed
* so treat it as optional. */
else if (e1->event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT &&
e2->event_type != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
{
g_test_message ("Skipping expected 'CHANGES_DONE_HINT' "
"at index %" G_GSIZE_FORMAT,
i);
i++;
continue;
}
/* If an event is marked as optional in the current environment and /* If an event is marked as optional in the current environment and
* the event doesn't match, it means the expected event has lost. */ * the event doesn't match, it means the expected event has lost. */
else if (env & e1->optional) else if (env & e1->optional)