From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 30 Aug 2023 08:26:57 +0000 (+0900)
Subject: Revert "test-dhcp-client: add temporary workaround for assertion failure"
X-Git-Tag: v255-rc1~618^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F29013%2Fhead;p=thirdparty%2Fsystemd.git

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.
---

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);