From 3b981f742838b0890d87437f4d76b71ba8183455 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 30 Aug 2023 17:26:57 +0900 Subject: [PATCH] Revert "test-dhcp-client: add temporary workaround for assertion failure" This reverts commit 1686c884bfa846f8da87621e87870eb18dd8107c. The issue should be fixed by the previous commit. Let's drop the workaround. --- src/libsystemd-network/test-dhcp-client.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c index 8c16d65bbc8..f3f558a3585 100644 --- a/src/libsystemd-network/test-dhcp-client.c +++ b/src/libsystemd-network/test-dhcp-client.c @@ -522,9 +522,7 @@ static void test_addr_acq(sd_event *e) { res = sd_dhcp_client_start(client); assert_se(IN_SET(res, 0, -EINPROGRESS)); - r = sd_event_loop(e); - /* Times out since https://github.com/systemd/systemd/issues/28990 add workaorund for now */ - assert_se(r >= 0 || r == -ETIMEDOUT); + assert_se(sd_event_loop(e) >= 0); assert_se(sd_dhcp_client_set_callback(client, NULL, NULL) >= 0); assert_se(sd_dhcp_client_stop(client) >= 0); -- 2.47.3