luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Reduce an unnecessary sleep from desktop-app-info test

Browse Source 
`g_app_info_launch_default_for_uri_async()` has already returned by this
point, so waiting a long time is not really going to help.

Wait for 3× as long as the successful case took, which should allow for
long enough to catch true negatives, with a bit of variance.

On my system, this means waiting for about 14ms, rather than the 100ms
which this previous slept for. This speeds the test up by about 5%.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-11-01 00:33:40 +00:00 committed by Marco Trevisan
parent cbf17c9422
commit 176f66502d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/tests/desktop-app-info.c
View File

@ -1292,6 +1292,7 @@ test_default_uri_handler_async (void)
GAppInfo *info; GAppInfo *info;
GMainLoop *loop; GMainLoop *loop;
gboolean called = FALSE; gboolean called = FALSE;
gint64 start_time, touch_time;
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);
info = create_app_info_toucher ("Touch Handled", "handled-async", info = create_app_info_toucher ("Touch Handled", "handled-async",
@ -1300,6 +1301,7 @@ test_default_uri_handler_async (void)
g_assert_true (G_IS_APP_INFO (info)); g_assert_true (G_IS_APP_INFO (info));
g_assert_nonnull (file_path); g_assert_nonnull (file_path);
start_time = g_get_real_time ();
g_app_info_launch_default_for_uri_async ("glib-async-touch://touch-me", NULL, g_app_info_launch_default_for_uri_async ("glib-async-touch://touch-me", NULL,
NULL, NULL,
on_launch_default_for_uri_success_cb, on_launch_default_for_uri_success_cb,
@ -1308,6 +1310,7 @@ test_default_uri_handler_async (void)
while (!g_file_test (file_path, G_FILE_TEST_IS_REGULAR) || !called) while (!g_file_test (file_path, G_FILE_TEST_IS_REGULAR) || !called)
g_main_context_iteration (NULL, FALSE); g_main_context_iteration (NULL, FALSE);
touch_time = g_get_real_time () - start_time;
g_assert_true (called); g_assert_true (called);
g_assert_true (g_file_test (file_path, G_FILE_TEST_IS_REGULAR)); g_assert_true (g_file_test (file_path, G_FILE_TEST_IS_REGULAR));
@ -1328,11 +1331,13 @@ test_default_uri_handler_async (void)
g_cancellable_cancel (cancellable); g_cancellable_cancel (cancellable);
g_main_loop_run (loop); g_main_loop_run (loop);
/* Once started our touch app may take some time before having written the /* If started, our touch app would take some time to actually write the
* file, so let's wait a bit here before ensuring that the file has been * file to disk, so let's wait a bit here to ensure that the file isn't
* created as expected. * inadvertently getting created when a launch operation is canceled up
* front. Give it 3× as long as the successful case took, to allow for
* some variance.
*/ */
g_usleep (G_USEC_PER_SEC / 10); g_usleep (touch_time * 3);
g_assert_false (g_file_test (file_path, G_FILE_TEST_IS_REGULAR)); g_assert_false (g_file_test (file_path, G_FILE_TEST_IS_REGULAR));
g_object_unref (info); g_object_unref (info);