luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

gnetworkaddress: Never end enumeration before resolving completes

Browse Source 
Previously once the end of addresses was reached it would return
NULL even if it was waiting on a dns response. Now it will keep
waiting so all addresses are received.

Fixes #1680
This commit is contained in:
Patrick Griffis
2019-02-11 08:53:23 -05:00
committed by Patrick Griffis
parent c83291049e
commit 085081ea2c
2 changed files with 47 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gio/tests/network-address.c
View File

@@ -648,7 +648,7 @@ test_happy_eyeballs_slow_ipv4 (HappyEyeballsFixture *fixture,
{
AsyncData data = { 0 };
/* If ipv4 dns response is a bit slow we just don't get them */
/* If ipv4 dns response is a bit slow we still get everything */
data.loop = fixture->loop;
mock_resolver_set_ipv4_delay_ms (fixture->mock_resolver, FAST_DELAY_LESS_THAN_TIMEOUT);
@@ -656,7 +656,7 @@ test_happy_eyeballs_slow_ipv4 (HappyEyeballsFixture *fixture,
g_socket_address_enumerator_next_async (fixture->enumerator, NULL, got_addr, &data);
g_main_loop_run (fixture->loop);
assert_list_matches_expected (data.addrs, fixture->input_ipv6_results);
assert_list_matches_expected (data.addrs, fixture->input_all_results);
}
static void
@@ -682,7 +682,7 @@ test_happy_eyeballs_very_slow_ipv6 (HappyEyeballsFixture *fixture,
{
AsyncData data = { 0 };
/* If ipv6 is very slow we don't get them */
/* If ipv6 is very slow we still get everything */
data.loop = fixture->loop;
mock_resolver_set_ipv6_delay_ms (fixture->mock_resolver, SLOW_DELAY_MORE_THAN_TIMEOUT);
@@ -690,7 +690,7 @@ test_happy_eyeballs_very_slow_ipv6 (HappyEyeballsFixture *fixture,
g_socket_address_enumerator_next_async (fixture->enumerator, NULL, got_addr, &data);
g_main_loop_run (fixture->loop);
assert_list_matches_expected (data.addrs, fixture->input_ipv4_results);
assert_list_matches_expected (data.addrs, fixture->input_all_results);
}
static void